search

fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
461 stars 10 forks source link

inline diff does not show for unknown file types #2183

Closed rburgst closed 2 months ago

rburgst commented 6 months ago

I am trying to view changes to a text file with the .def extension, however even though it shows up fine in winmerge, fork on windows wont show the diff in the window

grafik

Is there a way to tell fork to treat this as a text file anyway?

DanPristupov commented 6 months ago

Most likely file is in utf16 and git doesn't work well with it. Consider to change encoding to utf8. Or have a look at .gitattributes but it's quite tricky.

https://git-scm.com/docs/gitattributes#_working_tree_encoding:

*.json text working-tree-encoding=UTF-16 eol=LF
or
*.cpp text working-tree-encoding=UTF-16LE eol=CRLF
or
*.cpp text working-tree-encoding=UTF-16LE-BOM eol=CRLF

fork on windows wont show the diff

git on windows won't show the diff