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.

diff --git a/.gitattributes b/.gitattributes
index 7ce9120c29d6b2a75f490f83783786530d3f9859..47967c038902e177f033b4010071b67e72dcff3f 100644 (file)
--- 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