Skip to content

Instantly share code, notes, and snippets.

@robert-claypool

robert-claypool/p4merge-git-config

Last active August 29, 2015 14:22
Show Gist options
  • Save robert-claypool/e2ac71566d4ef100ff2a to your computer and use it in GitHub Desktop.
Save robert-claypool/e2ac71566d4ef100ff2a to your computer and use it in GitHub Desktop.
Download ZIP
A typical P4Merge Git configuration
Raw
p4merge-git-config
git config --global mergetool.p4merge.path 'c:\path-to\p4merge.exe'
git config --global merge.tool p4merge
git config --global difftool.p4merge.path 'c:\path-to\p4merge.exe'
git config --global diff.tool p4merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment