mirror of
https://github.com/postgres/postgres.git
synced 2025-11-01 21:31:19 +03:00
82f9968824
Recent changes to src/tools/ci/README triggered warnings like
src/tools/ci/README:88: leftover conflict marker
Raise conflict-marker-size in .gitattributes to avoid these.
34 lines
1.5 KiB
Plaintext
34 lines
1.5 KiB
Plaintext
* whitespace=space-before-tab,trailing-space
|
|
*.[chly] whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
|
|
*.pl whitespace=space-before-tab,trailing-space,tabwidth=4
|
|
*.pm whitespace=space-before-tab,trailing-space,tabwidth=4
|
|
*.po whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
|
|
*.sgml whitespace=space-before-tab,trailing-space,tab-in-indent
|
|
*.x[ms]l whitespace=space-before-tab,trailing-space,tab-in-indent
|
|
|
|
# Avoid confusing ASCII underlines with leftover merge conflict markers
|
|
README conflict-marker-size=48
|
|
README.* conflict-marker-size=48
|
|
|
|
# Certain data files that contain special whitespace, and other special cases
|
|
*.data -whitespace
|
|
contrib/pgcrypto/sql/pgp-armor.sql whitespace=-blank-at-eol
|
|
src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-blank-at-eol
|
|
src/backend/utils/Gen_dummy_probes.pl.prolog whitespace=-blank-at-eof
|
|
|
|
# Test output files that contain extra whitespace
|
|
*.out -whitespace
|
|
src/interfaces/ecpg/test/expected/* -whitespace
|
|
|
|
# These files are maintained or generated elsewhere. We take them as is.
|
|
configure -whitespace
|
|
ppport.h -whitespace
|
|
src/backend/jit/llvm/SectionMemoryManager.cpp -whitespace
|
|
src/backend/jit/llvm/SectionMemoryManager.LICENSE -whitespace
|
|
src/backend/regex/COPYRIGHT -whitespace
|
|
src/backend/snowball/libstemmer/*.c -whitespace
|
|
src/backend/utils/mb/Unicode/*-std.txt -whitespace
|
|
src/include/jit/SectionMemoryManager.h -whitespace
|
|
src/include/snowball/libstemmer/* -whitespace
|
|
src/timezone/data/* -whitespace
|