Skip to content

Instantly share code, notes, and snippets.

@wtowns

wtowns/p4merge Windows settings

Created October 7, 2010 18:13
Show Gist options
  • Save wtowns/615576 to your computer and use it in GitHub Desktop.
Save wtowns/615576 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig settings to use p4merge in Windows
Raw
p4merge Windows settings
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = "p4merge.exe $LOCAL $REMOTE"
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED"
trustExitCode = true
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment