Add vimdiff as mergetool