Skip to content

Instantly share code, notes, and snippets.

@mikemichaelis

mikemichaelis/gist:4f6d62a03300a24e97c1d19b9413371e

Created April 19, 2017 14:30
Show Gist options
  • Save mikemichaelis/4f6d62a03300a24e97c1d19b9413371e to your computer and use it in GitHub Desktop.
Save mikemichaelis/4f6d62a03300a24e97c1d19b9413371e to your computer and use it in GitHub Desktop.
Download ZIP
Setup p4merge as git mergetool in Windows (cmd & PS)
Raw
gistfile1.txt
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
@808codist
Copy link

This is what worked for me, as entered in Git Bash:

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "'C:/Program Files/Perforce/p4merge.exe' \$BASE \$LOCAL \$REMOTE \$MERGED"

1st command is same as others.

For the 2nd command, the \ before each $ prevents bash from trying to treat the last 4 arguments as environment variables.

@daveamol
Copy link

This is what worked for me, as entered in Git Bash:

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "'C:/Program Files/Perforce/p4merge.exe' \$BASE \$LOCAL \$REMOTE \$MERGED"

1st command is same as others.

For the 2nd command, the \ before each $ prevents bash from trying to treat the last 4 arguments as environment variables.

Finally. I was trying to figure out howto get it to work for cmder. This works perfectly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment