Skip to content

Instantly share code, notes, and snippets.

@sgur

sgur/2011-05-24-135549.gitconfig

Created May 24, 2011 04:58
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 sgur/988162 to your computer and use it in GitHub Desktop.
Save sgur/988162 to your computer and use it in GitHub Desktop.
Download ZIP
gitconfig (p4merge)
Raw
2011-05-24-135549.gitconfig
[merge]
tool = p4merge
[diff]
tool = p4merge
[difftool "p4merge"]
path = c:/Program Files/Perforce/p4merge.exe
cmd = \"c:/Program Files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "p4merge"]
path = c:/Program Files/Perforce/p4merge.exe
cmd = \"c:/Program Files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment