Use vim as git mergetool

I like editting the merge file and resolving the conflicts that way
rather than using a diff tool. They always seem to be more work.