Comment by djmdjm

I much prefer Meld (http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.