tom haynes

Using FileMerge with Git

This article explains how, but also has a lot of other information. Here’s my short summary:

  1. Run git mergetool -t opendiff
  2. Hit enter to start the merge
  3. Use up/down to move between conflict sections, and left/right to choose which one you want.
  4. When done: apple-S to save, apple-Q to quit.
  5. Hit enter to repeat for the next file.