First and foremost, configure Git to use vimdiff as a merge tool:

$ git config --global merge.tool vimdiff
$ git config --global merge.conflictstyle diff3
$ git config --global mergetool.prompt false

This will set Git as the default merge tool, will display a common ancestor while merging, and will disable the prompt asking you to open vimdiff.