Skip to content

Instantly share code, notes, and snippets.

@daniellee

daniellee/gist:5446026

Created April 23, 2013 18:18
Show Gist options
  • Save daniellee/5446026 to your computer and use it in GitHub Desktop.
Save daniellee/5446026 to your computer and use it in GitHub Desktop.
Download ZIP
Part of my .gitconfig
Raw
gistfile1.txt
[merge]
tool = p4merge
keepBackup = false
[mergetool "p4merge"]
cmd = p4merge.exe /\"$BASE/\" /\"$LOCAL/\" /\"$REMOTE/\" /\"$MERGED/\"
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
guitool = p4merge
[difftool]
prompt = false
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment