Skip to content

Instantly share code, notes, and snippets.

@Komsomol

Komsomol/gist:69ddfe298d3e0595c501e58d90cc3d1a

Created April 15, 2016 14:13
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Komsomol/69ddfe298d3e0595c501e58d90cc3d1a to your computer and use it in GitHub Desktop.
Save Komsomol/69ddfe298d3e0595c501e58d90cc3d1a to your computer and use it in GitHub Desktop.
Download ZIP
Setup XCode FileMerge as MergeTool for Git
Raw
gistfile1.txt
// Tell terminal where FileMerge lives.
sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer
// Configure git to use FileMerge
git config --global merge.tool opendiff
// Run mergetool
git mergetool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment