Use vim for git merge tool