I like git, vim and vimdiff a lot! Here’s how you configure git to use vim as editor and vimdiff as merge tool:

git config --global merge.tool vimdiff
git config --global core.editor vim