merge-file doc: set conflict-marker-size attribute #1895
Conversation
When committing a conflict resolution for a merge containing 1f010d6 (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 <[email protected]>
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
This patch series was integrated into seen via git@62e7eca. |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Phillip Wood via GitGitGadget" <[email protected]> writes:
> From: Phillip Wood <[email protected]>
>
> 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 <[email protected]>
> ---
> 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. |
|
This branch is now known as |
|
This patch series was integrated into seen via git@365b094. |
|
There was a status update in the "New Topics" section about the branch "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: <[email protected]> |
|
This patch series was integrated into seen via git@5017d37. |
|
This patch series was integrated into next via git@281b720. |
|
This patch series was integrated into seen via git@989a018. |
|
This patch series was integrated into seen via git@281b720. |
|
This patch series was integrated into seen via git@27d23a7. |
|
This patch series was integrated into seen via git@d346a28. |
|
There was a status update in the "Cooking" section about the branch "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: <[email protected]> |
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)