I recommend KDiff3:
http://kdiff3.sourceforge.net/
Others
Meld is typically used with Git on Linux, and, there's a Windows version:
https://live.gnome.org/Meld/Windows
I haven't used it in a while, but, I think many Windows people would recommend p4Merge