use vim as the git merge tool