Skip to content

Instantly share code, notes, and snippets.

@asanchezr

asanchezr/gist:22e669326524fb2dcad7eb860b908a92

Forked from kylefox/gist:4512777
Created May 4, 2020 23:58
Show Gist options
  • Save asanchezr/22e669326524fb2dcad7eb860b908a92 to your computer and use it in GitHub Desktop.
Save asanchezr/22e669326524fb2dcad7eb860b908a92 to your computer and use it in GitHub Desktop.
Download ZIP
If you want to use Xcode's FileMerge as your git mergetool, this is how you set it up.
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