Skip to content

Instantly share code, notes, and snippets.

@rvazquezglez

rvazquezglez/.gitconfig windows

Created December 26, 2012 17:14
Show Gist options
  • Save rvazquezglez/4381574 to your computer and use it in GitHub Desktop.
Save rvazquezglez/4381574 to your computer and use it in GitHub Desktop.
Download ZIP
Mi configuración de mergetools y difftools en windows.
Raw
.gitconfig windows
[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "bc3"]
path = C:\\Program Files (x86)\\Beyond Compare 3\\bcomp.exe
[mergetool "bc3"]
path = C:\\Program Files (x86)\\Beyond Compare 3\\bcomp.exe
[difftool "p4merge"]
path = C:\\Program Files\\Perforce\\p4merge.exe
[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