diff mbox series

[02/34] .gitattributes: more *.txt -> *.adoc updates

Message ID 20250303204443.360595-3-tmz@pobox.com (mailing list archive)
State New
Headers show
Series misc *.txt -> *.adoc fixes | expand

Commit Message

Todd Zullinger March 3, 2025, 8:44 p.m. UTC 
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>
---
 .gitattributes | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/.gitattributes b/.gitattributes
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