diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2025-08-15 10:29:16 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2025-08-15 10:29:16 +0200 |
| commit | 82f99688240fa4a870e332e05d564ca6e4cca075 (patch) | |
| tree | f5d12b11a4423cb9bb057307ffe5fc3645cc71ff | |
| parent | 199a347d29e5706498cd982c8df3da1c3f9374ec (diff) | |
Fix git whitespace warning
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.
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes index 63178f91700..5b8bc6a5e82 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,8 +7,8 @@ *.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=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 |