chiark / gitweb /
~ian / ian-dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 1f8f61d)
merge diff3
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 2 Aug 2017 13:19:32 +0000 (14:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 2 Aug 2017 13:19:32 +0000 (14:19 +0100)
templates/gitconfig.in patch | blob | history

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index 6aacb67d6cbd24cf6777ea9b405ce2224f3156ed..fffd447bc41cb1e2596282d6fb5cdee64716d84f 100755 (executable)
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -53,4 +53,6 @@ cat <<END
 [color]
        diff = false
        ui = false
 [color]
        diff = false
        ui = false
+[merge]
+       conflictStyle = diff3
 END
 END
Unnamed repository; edit this file 'description' to name the repository.