osx-diffmerge

# clean the git config
git config --global --unset diff
git config --global --unset diff.external
git config --global --unset diff.tool
git config --global --unset difftool.prompt
git config --global --unset merge.tool

# configure for DiffMerge
# https://sourcegear.com/diffmerge/downloads.php
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd "/usr/bin/diffmerge \"\$LOCAL\" \"\$REMOTE\""
git config --global --add difftool.prompt false

git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.trustExitCode true
git config --global mergetool.diffmerge.cmd "/usr/bin/diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\""