Skip to content

Instantly share code, notes, and snippets.

@davebrace

davebrace/p4merge-windows

Created March 17, 2013 20:31
Show Gist options
  • Save davebrace/5183492 to your computer and use it in GitHub Desktop.
Save davebrace/5183492 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge settings for Git on Windows.
Raw
p4merge-windows
git config --global mergetool.p4merge.path 'C:\Program Files\Perforce\p4merge.exe'
git config --global merge.tool p4merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment