Skip to content

Instantly share code, notes, and snippets.

Avatar
😸

Will Hannah quasivivo

😸
  • Cleveland, OH
  • Twitter @wph
View GitHub Profile
@kylefox
kylefox / gist:4512777
Created Jan 11, 2013
If you want to use Xcode's FileMerge as your git mergetool, this is how you set it up.
View gist:4512777
# 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