git-meld utility (to be configured in ~/.gitconfig)