Kdiff3 has been my favourite diff tool for a while and I always have to look up how to configure it to be automatically launched when using Git from the command line. So it's going in the blog! For Linux sudo apt-get update sudo apt-get install kdiff3… more »