Created
January 11, 2013 18:15
-
Star
(141)
You must be signed in to star a gist -
Fork
(14)
You must be signed in to fork a gist
-
-
Save kylefox/4512777 to your computer and use it in GitHub Desktop.
If you want to use Xcode's FileMerge as your git mergetool, this is how you set it up.
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
| # Tell system when Xcode utilities live: | |
| sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer | |
| # Set "opendiff" as the default mergetool globally: | |
| git config --global merge.tool opendiff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
😎 Thanks for this.