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 830313e90f34577601035759f16a1cb3d03895cd..3b94e37229bcf606cf220dd0a8ac0644f5ec6e49 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