On 4/1/13, Nick Sabalausky <seewebsitetocontac...@semitwist.com> wrote: > I've been using Beyond Compare <http://www.scootersoftware.com/>
Me too. And the obligatory tip for anyone trying to use it with Git: Add this to your .gitconfig file (and make sure you're setting the path to BCompare.exe and not BComp.exe): [diff] tool = bc3 [difftool "bc3"] path = C:/program files/beyond compare 3/BCompare.exe And some aliases for .bashrc I use myself: alias bdiff='git difftool --dir-diff' alias bcdiff='git difftool --dir-diff --cached' alias bhdiff='git difftool --dir-diff head~1'