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

Tags: , , , , , , , ,

This entry was posted on Friday, February 13th, 2009 at 00:32. You can follow any responses to this entry through the RSS 2.0 feed. You can leave a response, or trackback from your own site.

One Response to “Why vimdiff?”

  • Mike Lewis Says:
    September 24th, 2009 at 08:24

    I can’t find 3-way features with opendiff. I do like vimdiff as well. For 3-way diffs I found kdiff3 to be the best, once you get used it’s wonky interface

Leave a Reply