Skip to content

Instantly share code, notes, and snippets.

@michaellehmkuhl

michaellehmkuhl/gist:43cfdcb6ed7b006dd586

Forked from kylefox/gist:4512777
Last active August 29, 2015 14:15
Show Gist options
  • Save michaellehmkuhl/43cfdcb6ed7b006dd586 to your computer and use it in GitHub Desktop.
Save michaellehmkuhl/43cfdcb6ed7b006dd586 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.sh
# 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