This article explains how, but also has a lot of other information. Here’s my short summary:
- Run git mergetool -t opendiff
- Hit enter to start the merge
- Use up/down to move between conflict sections, and left/right to choose which one you want.
- When done: apple-S to save, apple-Q to quit.
- Hit enter to repeat for the next file.