Skip to content

Instantly share code, notes, and snippets.

@andresmoschini

andresmoschini/P4Merge and Git Extensions.md

Last active November 9, 2022 20:16
Show Gist options
  • Star 9 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save andresmoschini/a127d003885f7e137ef2889fb9e54844 to your computer and use it in GitHub Desktop.
Save andresmoschini/a127d003885f7e137ef2889fb9e54844 to your computer and use it in GitHub Desktop.
Download ZIP
P4Merge and Git Extensions
Raw
P4Merge and Git Extensions.md
  1. Download and install p4Merge (Helix P4Merge: Visual Merge Tool) from Perforce page
  2. Configure Git Extensions (Tools / Settings / Git Config) with the follow values (see image):
    • Mergetool: p4merge
    • Path to mergetool: C:/Program Files/Perforce/p4merge.exe
    • Mergetool command: "C:/Program Files/Perforce/p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    • Difftool: p4merge
    • Path to difftool: C:/Program Files/Perforce/p4merge.exe
    • Difftool command: "C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment