[hoseja]

There is an option [0] to use non-default but still built-in git diff algorithms that might yield better results.

[0] https://git-scm.com/docs/git-diff#Documentation/git-diff.txt...

[NateEag]

I've used a few of the different git diff algorithms and still have had problems like these.