GitExtension + Kdiff3 on Windows 10 --> new lines
Dear developers,
I may be wrong, forgive me, I am using this edition: 1.9.2 on Windows 10 (https://download.kde.org/stable/kdiff3/) and on a conflict the GitExtension calls kdiff3 to help resolve the differences.
Kdiff3 reads the files (BASE, REMOTE, LOCAL, ...) and it shows me "Line ending conflict" and I cannot merge them. What I found is even the file windows-1250 encoded, Kdiff3 sees it as Linux formatted file. And, what is more frustrating, every 3 files reads as if it would be empty lines after every line. (plus extra lines)
The probelm disappears when I modify the 3 files (made by GitExtension next to the original local file), (using notepad++) converting them to unix-format-line-endings, then I press F5 in Kdiff3, and the lines numbering becomes OK, there is no extra empty lines, and I can merge them successfully.
Is there any options I can set to avoid this "function"? Or the Windows binary maybe wrong?
Thank you!