Skip to content

Instantly share code, notes, and snippets.

@danzel

danzel/gist:b6158ecf53aaf8b552e1

Created September 1, 2014 21:28
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 danzel/b6158ecf53aaf8b552e1 to your computer and use it in GitHub Desktop.
Save danzel/b6158ecf53aaf8b552e1 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge git extensions
Raw
gistfile1.txt
Tools, Settings
Mergetool: Choose p4merge
Difftool: type "p4merge" (no quotes)
Path: C:/Program Files/Perforce/p4merge.exe
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