Add vimdiff as a merge tool