.gitattributes: more *.txt -> *.adoc updates
All Documentation files now end in .adoc. Update the entries for git-merge.adoc, gitk.adoc, and user-manual.adoc to properly set the conflict-marker-size attribute. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Todd Zullinger committed
Mar 3, 2025 at 15:44 UTC
33af5a333416317f5d1fe0c8c9f980617a413aa8
1 file changed
+3
-3
.gitattributes
+3
-3
index 43fa883a84..c6a0b35116 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,7 +12,7 @@ CODE_OF_CONDUCT.md -whitespace
/GIT-VERSION-GEN text eol=lf
/mergetools/* text eol=lf
/t/oid-info/* text 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
+/Documentation/git-merge.adoc conflict-marker-size=32
+/Documentation/gitk.adoc conflict-marker-size=32
+/Documentation/user-manual.adoc conflict-marker-size=32
/t/t????-*.sh conflict-marker-size=32