We have defined line endings and file encoding in a .gitattributes file. When resolving a merge conflict using the internal editor, the encoding and line endings are no longer correct. In the comparison window, special characters appear where umlauts were before. Using an external merge tool (WinMerge) works correctly.
We use V 1.92.00.
.gitattributes:
*.c text working-tree-encoding=windows-1252 eol=crlf
Hi
We have defined line endings and file encoding in a .gitattributes file. When resolving a merge conflict using the internal editor, the encoding and line endings are no longer correct. In the comparison window, special characters appear where umlauts were before. Using an external merge tool (WinMerge) works correctly.
We use V 1.92.00.
.gitattributes: *.c text working-tree-encoding=windows-1252 eol=crlf
Regards Stefan