Use kdiff3 as Git's merge tool.