rgeoghegan/git-meld

Use any diff tool (including meld) with git