Use vimdiff for git merge tool