Skip to content

Instantly share code, notes, and snippets.

@neversun

neversun/gist:bb7936aecddaf5fe4519dcc9cb95dd13

Forked from kylefox/gist:4512777
Created April 26, 2018 08:48
Show Gist options
  • Save neversun/bb7936aecddaf5fe4519dcc9cb95dd13 to your computer and use it in GitHub Desktop.
Save neversun/bb7936aecddaf5fe4519dcc9cb95dd13 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