database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-27 00:12:01 +03:00
Code Activity

Fix git whitespace warning

Browse Source 
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.
This commit is contained in:
Peter Eisentraut
2025-08-15 10:29:16 +02:00
parent 1571c7ca5d
commit ad3990ffea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@@ -12,8 +12,8 @@
*.xsl whitespace=space-before-tab,trailing-space,tab-in-indent *.xsl whitespace=space-before-tab,trailing-space,tab-in-indent
# Avoid confusing ASCII underlines with leftover merge conflict markers # Avoid confusing ASCII underlines with leftover merge conflict markers
README conflict-marker-size=32 README conflict-marker-size=48
README.* conflict-marker-size=32 README.* conflict-marker-size=48
# Certain data files that contain special whitespace, and other special cases # Certain data files that contain special whitespace, and other special cases
*.data -whitespace *.data -whitespace