Skip to content

Instantly share code, notes, and snippets.

@zirosas

zirosas/Set DiffMerge as default merge tool in OS X

Last active January 13, 2016 16:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save zirosas/11417954 to your computer and use it in GitHub Desktop.
Save zirosas/11417954 to your computer and use it in GitHub Desktop.
Download ZIP
Set DiffMerge as default merge tool in OS X From https://coderwall.com/p/3wuuda
Raw
Set DiffMerge as default merge tool in OS X
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.diffmerge.trustExitCode true
ln -s /Applications/DiffMerge.app/Contents/Resources/diffmerge.sh /usr/local/bin/diffmerge
git config --global mergetool.keepBackup false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment