postgres.git / summary / log / commit / refs

commit    2b79e12095351470370d422e291bbb3c929db2c8
Author:   Peter Eisentraut <peter@eisentraut.org>
Date:     Fri Aug 15 08:29:16 2025 +0000
First released in: 15.15, 16.11, 17.7, 18.0

    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 830313e90f3..3b94e37229b 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


[parent: 04b384b3efb2]