Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add configurations for different merge tools

  • Loading branch information...
commit 4aa2c41961a9f75eb92927a34824eed61f4ab04f 1 parent 04d65f5
@paulcbetts paulcbetts authored
Showing with 26 additions and 0 deletions.
  1. +26 −0 etc/gitconfig
View
26 etc/gitconfig
@@ -35,3 +35,29 @@
[filter "ghcleansmudge"]
clean = cat
smudge = cat
+
+[alias]
+ dt = difftool
+ mt = mergetool
+[diff]
+ tool = vs11
+[difftool]
+ prompt = false
+[difftool "bc4"]
+ cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
+[difftool "p4"]
+ 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\"
+
+[merge]
+ tool = bc3
+[mergetool]
+ prompt = false
+ keepBackup = false
+[mergetool "bc3"]
+ cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
+ trustExitCode = true
+[mergetool "p4"]
+ cmd = \"c:/program files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
+ trustExitCode = false
Please sign in to comment.
Something went wrong with that request. Please try again.