Skip to content

Instantly share code, notes, and snippets.

@ssmythe

ssmythe/gist:1b44f58b97624842529179a11d821a38

Forked from kylefox/gist:4512777
Last active March 23, 2020 17:30
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ssmythe/1b44f58b97624842529179a11d821a38 to your computer and use it in GitHub Desktop.
Save ssmythe/1b44f58b97624842529179a11d821a38 to your computer and use it in GitHub Desktop.
Download ZIP
If you want to use diffmerge as your git mergetool, this is how you set it up.
Raw
gistfile1.sh
# Install diffmerge on macOS
brew cask install diffmerge
# Set "diffmerge" as the default difftool globally:
git config --global diff.tool diffmerge
# Set "diffmerge" as the default mergetool globally:
git config --global merge.tool diffmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment