merge-file doc: set conflict-marker-size attribute

[phillipwood]

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)

[phillipwood]

/submit

[gitgitgadget]

Submitted as pull.1895.git.1743173140253.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1895/phillipwood/merge-file-doc-attributes-v1

To fetch this version to local tag pr-1895/phillipwood/merge-file-doc-attributes-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1895/phillipwood/merge-file-doc-attributes-v1

[gitgitgadget]

This patch series was integrated into seen via git@62e7eca.

[gitgitgadget]

On the Git mailing list, Junio C Hamano wrote (reply to this):

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

> 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.

[gitgitgadget]

This branch is now known as pw/custom-conflict-marker-size-for-merge-related-docs.

[gitgitgadget]

This patch series was integrated into seen via git@365b094.

[gitgitgadget]

There was a status update in the "New Topics" section about the branch pw/custom-conflict-marker-size-for-merge-related-docs on the Git mailing list:

"git-merge-file" documentation source, which has lines that look
like conflict markers, lacked custom conflict marker size defined,
which has been corrected..

Will merge to 'next'.
source: <pull.1895.git.1743173140253.gitgitgadget@gmail.com>

[gitgitgadget]

This patch series was integrated into seen via git@5017d37.

[gitgitgadget]

This patch series was integrated into next via git@281b720.

[gitgitgadget]

This patch series was integrated into seen via git@989a018.

[gitgitgadget]

This patch series was integrated into seen via git@281b720.

[gitgitgadget]

This patch series was integrated into seen via git@27d23a7.

[gitgitgadget]

This patch series was integrated into seen via git@d346a28.

[gitgitgadget]

There was a status update in the "Cooking" section about the branch pw/custom-conflict-marker-size-for-merge-related-docs on the Git mailing list:

"git-merge-file" documentation source, which has lines that look
like conflict markers, lacked custom conflict marker size defined,
which has been corrected..

Will merge to 'master'.
source: <pull.1895.git.1743173140253.gitgitgadget@gmail.com>

[gitgitgadget]

This patch series was integrated into seen via git@693c86d.

[gitgitgadget]

This patch series was integrated into seen via git@11e4c8c.

[gitgitgadget]

This patch series was integrated into master via git@11e4c8c.

[gitgitgadget]

This patch series was integrated into next via git@11e4c8c.

[gitgitgadget]

Closed via 11e4c8c.