Git + P4Merge

I prefer P4Merge to KDiff3: simpler, easier on the eyes.

I wrote a small wrapper script to better integrate Git and P4Merge along with installation instructions: http://pempek.net/articles/2014/04/18/git-p4merge/

By now, you can benefit from a unified git difftool / git mergetool experience across Windows, Mac and Linux.