Skip to content

Instantly share code, notes, and snippets.

@rachelbaker

rachelbaker/gist:aa00c9f56fbd01bd3017

Created June 27, 2014 21:05
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rachelbaker/aa00c9f56fbd01bd3017 to your computer and use it in GitHub Desktop.
Save rachelbaker/aa00c9f56fbd01bd3017 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1
[diff]
tool = opendiff
[difftool]
prompt = false
[difftool "opendiff"]
cmd = /usr/bin/opendiff \"$LOCAL\" \"$REMOTE\" -merge \"$MERGED\" | cat
[merge]
tool = opendiff
[mergetool "opendiff"]
cmd = /usr/bin/opendiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment