Re: [PATCH] merge-file doc: set conflict-marker-size attribute

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 29, 2025, 23:36 UTC
Message-ID: <xmqqv7rrbe9e.fsf@gitster.g>
In-Reply-To: <pull.1895.git.1743173140253.gitgitgadget@gmail.com>

"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 16 quoted lines

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> 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>
> ---
>     merge-file doc: set conflict-marker-size attribute
>     
>     Grepping around I can't find any other files with conflict markers
>     without this attribute set. (If there were I think my pre-commit hook
>     would have complained about them as well)

Well spotted. "git grep -n '^<<<<<<<'" tells me that the git-merge-file, git-merge, and user-manual require them, but this was a rather old line dating back from 2008, so it is a bit surprising nobody caught it before.

Will queue.  Thanks.