Skip to content

Instantly share code, notes, and snippets.

@dirvo

dirvo/Setting-up-p4merge-on-bash

Last active April 12, 2018 15:07
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 dirvo/fdd60d418b7f6677b9cc12764b49455c to your computer and use it in GitHub Desktop.
Save dirvo/fdd60d418b7f6677b9cc12764b49455c to your computer and use it in GitHub Desktop.
Download ZIP
Setting up p4merge as git mergetool in Windows (on Git Bash and cmd+PS)
Raw
Setting-up-p4merge-on-bash
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "'C:/Program Files/Perforce/p4merge.exe' \$BASE \$LOCAL \$REMOTE \$MERGED"
Raw
Setting-up-p4merge-on-cmd-ps
git config --global merge.tool p4merge
git config --global mergetool.p4merge.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