33af5a3334
All Documentation files now end in .adoc. Update the entries for git-merge.adoc, gitk.adoc, and user-manual.adoc to properly set the conflict-marker-size attribute. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
19 lines
634 B
Plaintext
19 lines
634 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/gitk.adoc conflict-marker-size=32
|
|
/Documentation/user-manual.adoc conflict-marker-size=32
|
|
/t/t????-*.sh conflict-marker-size=32
|