chiark / gitweb /
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

index 6aacb67..fffd447 100755 (executable)
@@ -53,4 +53,6 @@ cat <<END
 [color]
        diff = false
        ui = false
+[merge]
+       conflictStyle = diff3
 END