From: Phillip Wood Date: Fri, 28 Mar 2025 14:45:40 +0000 (+0000) Subject: merge-file doc: set conflict-marker-size attribute X-Git-Tag: v2.50.0-rc0~118^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3b5832381c42ba3dfd79b18dea035bcc995b10a;p=thirdparty%2Fgit.git merge-file doc: set conflict-marker-size attribute When committing a conflict resolution for a merge containing 1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20) my pre-commit hook failed because "git diff --check" thought there was a left over conflict marker in "merge-file.adoc". Fix this by setting the "conflict-marker-size" attribute as we do for all the other documentation files that contain example conflict markers. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- diff --git a/.gitattributes b/.gitattributes index c6a0b35116..32583149c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,6 +13,7 @@ CODE_OF_CONDUCT.md -whitespace /mergetools/* text eol=lf /t/oid-info/* text eol=lf /Documentation/git-merge.adoc conflict-marker-size=32 +/Documentation/git-merge-file.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