Feb
13
2009
Why vimdiff?
I love Vim and vimdiff, but vimdiff is pitiful for doing 3-way merges. So I wonder why git’s search for a merge tool prefers vimdiff over opendiff (which launches OS X’s fantastic FileMerge program).
git config --global merge.tool opendiff