Created
April 15, 2016 14:13
-
-
Save Komsomol/69ddfe298d3e0595c501e58d90cc3d1a to your computer and use it in GitHub Desktop.
Setup XCode FileMerge as MergeTool for Git
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 terminal where FileMerge lives. | |
| sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer | |
| // Configure git to use FileMerge | |
| git config --global merge.tool opendiff | |
| // Run mergetool | |
| git mergetool |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment