Following on from an earlier post where I described how to use Meld with git's mergetool, here's how to use it with difftool too...



Fairly obvious really, although the $PWD isn't required for the local file.

Once you've done this, you can also set up gitk to use Meld as an external diff tool, by just setting "Exernal diff tool" to meld.