Use difftastic. You can do so with current git :)