-
-
Save asanchezr/22e669326524fb2dcad7eb860b908a92 to your computer and use it in GitHub Desktop.
Revisions
-
kylefox created this gist
Jan 11, 2013 .There are no files selected for viewing
This file contains hidden or 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 charactersOriginal file line number Diff line number Diff line change @@ -0,0 +1,5 @@ # 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