Line style conflicts + extra lines added on Windows
This bug:
- #25 (closed)
- https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256606
- https://stackoverflow.com/questions/69177194/how-to-solve-the-problem-that-kdiff-adds-extra-blank-lines-when-resolving-merge
is still not fixed on Windows in the latest version of KDiff3 (1.9.3).
I think it's a pretty serious bug which makes KDiff3 unusable on Windows. To workaround it I have to downgrade to version 1.8.5.
Short description of a bug:
When solving merge conflicts on Windows, I receive line ending conflict which is really annoying. After I choose the Windows line ending and save the file, the resulting file has extra white spaces.
Thus, if my file looks like this:
abc
def
ghi
After solving merge conflicts, it looks like this:
abc
def
ghi