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

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)

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1895%2Fphillipwood%2Fmerge-file-doc-attributes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1895/phillipwood/merge-file-doc-attributes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1895

 .gitattributes | 1 +
 1 file changed, 1 insertion(+)