From: Todd Zullinger Date: Mon, 3 Mar 2025 20:44:00 +0000 (-0500) Subject: .gitattributes: more *.txt -> *.adoc updates X-Git-Tag: v2.49.0-rc2~4^2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33af5a333416317f5d1fe0c8c9f980617a413aa8;p=thirdparty%2Fgit.git .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 Signed-off-by: Junio C Hamano --- 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