Skip to content

Instantly share code, notes, and snippets.

@mwjackson

mwjackson/.gitconfig

Created October 19, 2011 11:14
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save mwjackson/1298002 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save mwjackson/1298002 to your computer and use it in GitHub Desktop.
Download ZIP
p4merge with git (msysgit)
Raw
.gitconfig
[diff]
tool = p4merge
[difftool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
[merge]
summary = true
tool = p4merge
[mergetool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
keepBackup = false
@mhinze
Copy link
Copy Markdown

mhinze commented Mar 9, 2012

Thanks for this. Handy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment