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 <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 28, 2025 at 14:45 UTC
d3b5832381c42ba3dfd79b18dea035bcc995b10a
1 file changed
+1
.gitattributes
+1
@@ -13,6 +13,7 @@ CODE_OF_CONDUCT.md -whitespace
13
/mergetools/* text eol=lf
14
/t/oid-info/* text eol=lf
15
/Documentation/git-merge.adoc conflict-marker-size=32
16
+/Documentation/git-merge-file.adoc conflict-marker-size=32
17
/Documentation/gitk.adoc conflict-marker-size=32
18
/Documentation/user-manual.adoc conflict-marker-size=32
19
/t/t????-*.sh conflict-marker-size=32