It seems I have gained a reputation amongst my peers to be a diff tool hopper. That is, I am on a quest to find the perfect diff tool for my development. I think I have given just about every free tool out there a good run for it’s money and tend to move to the next one when I find myself in a situation that the current tool cannot cope with.
After exhausting all the free options, I made the shift to the commercial tool Beyond Compare 3 a few weeks ago and have not looked back since. So far, it has been awesome. Slick, easy to understand the differences and the pro version even does the three way merging needed for git.
Under Global Settings:
Merge tool: BCompare
Path to mergetool: C:/Path/To/BComp.exe
Mergetool command: “C:/Path/To/BComp.exe” “$LOCAL” “$REMOTE” “$BASE” “$MERGED”
Diff tool: BCompare
Path to difftool: C:/Path/To/BComp.exe
Difftool command: “C:/Path/To/BComp.exe” “$LOCAL” “$REMOTE”
Make sure you dont override the tool in the local settings or if you want to set it to BCompare.