Install MacVim and the command line tool, mvim.

Then in your ~/.gitconfig add this, thusly (replacing the path to mvim with the correct one):

[merge]
tool = mvim
[mergetool “mvim”]
…

2:31 pm  •  30 October 2009