Skip to content

Instantly share code, notes, and snippets.

@pedroreys

pedroreys/.gitconfig

Created February 5, 2014 21:47
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 pedroreys/8833860 to your computer and use it in GitHub Desktop.
Save pedroreys/8833860 to your computer and use it in GitHub Desktop.
Download ZIP
Configuring git to use p4merge on Windows
Raw
.gitconfig
[merge]
tool = p4merge
[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