git-difftool is quite helpful, especially if you want an easy way to integrate existing file-based diff tools.