Is there a recommended external diff tool that ameliorates these issues?
$ git diff | cat -v
git diff > tmp.diff
and open with a text editor?
git diff | less -U