Andrew's git / gitweb.git / diff
?
Merge branch 'tg/conflict-marker-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
Developer aid.

* tg/conflict-marker-size:
.gitattributes: add conflict-marker-size for relevant files

.gitattributes patch | blob | history
diff --git a/.gitattributes b/.gitattributes
index 1bdc91e282c5393c527b3902a208227c19971b84..49b30516419c8dfe8c039ef368a3af984439ebcc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,7 @@
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf
 /mergetools/* eol=lf
+/Documentation/git-merge.txt conflict-marker-size=32
+/Documentation/gitk.txt conflict-marker-size=32
+/Documentation/user-manual.txt conflict-marker-size=32
+/t/t????-*.sh conflict-marker-size=32