From 82f99688240fa4a870e332e05d564ca6e4cca075 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Fri, 15 Aug 2025 10:29:16 +0200
Subject: [PATCH] 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.
---
 .gitattributes | 4 ++--
 1 file 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