diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:17 -0700 |
| commit | 11e4c8cd9c14dbf9d561928a6ada5a79a3b6c17a (patch) | |
| tree | a3f004ea1f5aeda5b76f6c91dd2a01269bd008b7 | |
| parent | 7b03646f85b6eb4c0f6e05ed4b235577d3969532 (diff) | |
| parent | d3b5832381c42ba3dfd79b18dea035bcc995b10a (diff) | |
Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'
"git-merge-file" documentation source, which has lines that look
like conflict markers, lacked custom conflict marker size defined,
which has been corrected..
* pw/custom-conflict-marker-size-for-merge-related-docs:
merge-file doc: set conflict-marker-size attribute
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index c6a0b35116..32583149c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,6 +13,7 @@ CODE_OF_CONDUCT.md -whitespace /mergetools/* text eol=lf /t/oid-info/* text eol=lf /Documentation/git-merge.adoc conflict-marker-size=32 +/Documentation/git-merge-file.adoc conflict-marker-size=32 /Documentation/gitk.adoc conflict-marker-size=32 /Documentation/user-manual.adoc conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32 |