Skip to content

Instantly share code, notes, and snippets.

@pt-arvind

pt-arvind/gist:5d87e8eba5aa8946d5ba

Created February 20, 2015 22:37
Show Gist options
  • Save pt-arvind/5d87e8eba5aa8946d5ba to your computer and use it in GitHub Desktop.
Save pt-arvind/5d87e8eba5aa8946d5ba to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = "'/Applications/p4merge.app/Contents/Resources/launchp4merge'" "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = "'/Applications/p4merge.app/Contents/Resources/launchp4merge'" "\"$LOCAL\"" "\"$REMOTE\""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment