open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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.
pull/239/head
Peter Eisentraut 4 weeks ago
parent 8212c83939
commit 2e2e7ff7b8
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      .gitattributes

4
.gitattributes vendored
Unescape View File

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

Write Preview
Loading…
Cancel
Save