Permalink
Browse files

Configure diffuse as default diff/mergetool

  • Loading branch information...
1 parent 8c5289b commit 9ef1d6523c8640e04680da27c385d1469e369aa9 @paulcbetts paulcbetts committed Mar 9, 2012
Showing with 7 additions and 2 deletions.
  1. +7 −2 etc/gitconfig
View
@@ -40,7 +40,7 @@
dt = difftool
mt = mergetool
[diff]
- tool = vs11
+ tool = diffuse
[difftool]
prompt = false
[difftool "bc4"]
@@ -49,9 +49,11 @@
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[difftool "vs11"]
cmd = \"c:/program files (x86)/microsoft visual studio 11.0/common7/ide/devenv.exe\" '//diff' \"$LOCAL\" \"$REMOTE\"
+[difftool "diffuse"]
+ cmd = diffuse \"$LOCAL\" \"$REMOTE\"
[merge]
- tool = bc3
+ tool = diffuse
[mergetool]
prompt = false
keepBackup = false
@@ -61,3 +63,6 @@
[mergetool "p4"]
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
+[mergetool "diffuse"]
+ cmd = diffuse \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
+

0 comments on commit 9ef1d65

Please sign in to comment.