Skip to content

Instantly share code, notes, and snippets.

@dpoindexter

dpoindexter/gist:de3ebb7aa5d2269250e8

Created January 22, 2015 03:35
Show Gist options
  • Save dpoindexter/de3ebb7aa5d2269250e8 to your computer and use it in GitHub Desktop.
Save dpoindexter/de3ebb7aa5d2269250e8 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge gitconfig section
Raw
gistfile1.txt
[mergetool "p4merge"]
cmd = "p4merge.exe $BASE $LOCAL $REMOTE $MERGED"
path = c:/Program Files/Perforce/p4merge.exe
[merge]
tool = p4merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment