Skip to content

Instantly share code, notes, and snippets.

@Ollo
Created December 17, 2012 20:31
Show Gist options
  • Save Ollo/4321906 to your computer and use it in GitHub Desktop.
Save Ollo/4321906 to your computer and use it in GitHub Desktop.
git config to use xcode file compare for mergetool
[merge]
tool = opendiff
[core]
quotepath = false
excludesfile = /Users/jray/.gitignore
whitespace=nowarn
[credential]
helper = osxkeychain
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment