Last active
January 13, 2016 16:21
-
-
Save zirosas/11417954 to your computer and use it in GitHub Desktop.
Set DiffMerge as default merge tool in OS X From https://coderwall.com/p/3wuuda
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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