I don\'t think it\'s a line ending difference issue - p4merge does not think anything has changed in the file, even when set to recognize line ending and white space differe
To show such "invisible" changes in details use:
git diff --word-diff-regex=.
This will mark all changed characters, even whitespace.
Most probably it will show a change in line endings. If you are working on Windows and turned on core.autocrlf
, git might expect the other kind of line ending and show the "wrong" line ending as diff.
Telling git to not care about line endings by turning off core.autocrlf
should fix your issue.