Skip to content

Instantly share code, notes, and snippets.

@iampeterbanjo

iampeterbanjo/p4merge

Last active September 10, 2015 16:30
Show Gist options
  • Save iampeterbanjo/8c41297a8ed0c221f0f0 to your computer and use it in GitHub Desktop.
Save iampeterbanjo/8c41297a8ed0c221f0f0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
p4merge
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path 'C:\Program Files\Perforce\p4merge.exe'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment