kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2025-04-15 13:50:17 -07:00
parent 7b03646f85 d3b5832381
commit 11e4c8cd9c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -13,6 +13,7 @@ CODE_OF_CONDUCT.md -whitespace
/mergetools/* text eol=lf /mergetools/* text eol=lf
/t/oid-info/* text eol=lf /t/oid-info/* text eol=lf
/Documentation/git-merge.adoc conflict-marker-size=32 /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/gitk.adoc conflict-marker-size=32
/Documentation/user-manual.adoc conflict-marker-size=32 /Documentation/user-manual.adoc conflict-marker-size=32
/t/t????-*.sh conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32