Skip to content

Instantly share code, notes, and snippets.

@kylefox

kylefox/gist:4512777

Created January 11, 2013 18:15
Show Gist options
  • Save kylefox/4512777 to your computer and use it in GitHub Desktop.
Save kylefox/4512777 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
@nest-don
Copy link

nest-don commented Oct 4, 2022

thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment