Use vimdiff as mergetool.