Permalink
Browse files

enables the diff3 conflict style for merges

  • Loading branch information...
1 parent 51e43cd commit 63aee85bc0ad61dc830306855fd961399c4b7b77 @chriskau committed Feb 11, 2012
Showing with 6 additions and 12 deletions.
  1. +6 −12 git/gitconfig.symlink
View
18 git/gitconfig.symlink 100755 → 100644
@@ -53,24 +53,18 @@
[pack]
threads = 0
-[diff "localizablestrings"]
- textconv = "iconv -f utf-16 -t utf-8"
-[merge]
- tool = chdiff
-[mergetool "chdiff"]
- cmd = /usr/bin/env chdiff --wait "$LOCAL" "$REMOTE"
- keepBackup = false
- trustExitCode = false
[gc]
reflogexpire = 300
reflogexpireunreachable = 90
[sendemail]
chainreplyto = false
cccmd = git-cc
-[difftool "Kaleidoscope"]
- cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+
+[diff]
+ tool = vimdiff
[difftool]
prompt = false
-[diff]
- tool = Kaleidoscope
+
+[merge]
+ conflictstyle = diff3

0 comments on commit 63aee85

Please sign in to comment.