Vim is my favourite editor, but my favourite merge tool by far is Meld.