d3b5832381
When committing a conflict resolution for a merge containing
1f010d6bdf (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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 lines
693 B
Plaintext
20 lines
693 B
Plaintext
* whitespace=!indent,trail,space
|
|
*.[ch] whitespace=indent,trail,space diff=cpp
|
|
*.sh whitespace=indent,trail,space text eol=lf
|
|
*.perl text eol=lf diff=perl
|
|
*.pl text eof=lf diff=perl
|
|
*.pm text eol=lf diff=perl
|
|
*.py text eol=lf diff=python
|
|
*.bat text eol=crlf
|
|
CODE_OF_CONDUCT.md -whitespace
|
|
/Documentation/**/*.adoc text eol=lf
|
|
/command-list.txt text eol=lf
|
|
/GIT-VERSION-GEN text eol=lf
|
|
/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
|