Skip to content

Instantly share code, notes, and snippets.

@ltcdnunez

ltcdnunez/config

Created October 23, 2012 23:26
Show Gist options
  • Save ltcdnunez/3942476 to your computer and use it in GitHub Desktop.
Save ltcdnunez/3942476 to your computer and use it in GitHub Desktop.
Download ZIP
Git config for p4merge
Raw
config
[merge]
tool = p4merge
[diff]
tool = p4diff
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment