Skip to content

Instantly share code, notes, and snippets.

@tdshipley

tdshipley/.gitconfig

Created April 20, 2018 13:21
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 tdshipley/92308a621a88d6bfdf6a6a6b6d9cf852 to your computer and use it in GitHub Desktop.
Save tdshipley/92308a621a88d6bfdf6a6a6b6d9cf852 to your computer and use it in GitHub Desktop.
Download ZIP
Perforce P4 Merge Git Config
Raw
.gitconfig
[diff]
tool = p4merge
[difftool "p4merge"]
path = C:\\Program Files\\Perforce\\p4merge.exe
[merge]
tool = p4merge
[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