Added vimdiff as the mergetool