smoll

Using DiffMerge as your git mergetool (for Mac OS X / macOS)

Reference(s):

• http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/
• http://stackoverflow.com/a/1251696

Step 1: download and install the DiffMerge OS X Installer

http://www.sourcegear.com/diffmerge/downloads.php - get the installer version, NOT the dmg version