postgres.git / summary / log / commit / refs

commit    1d5205d88b79beb2a697be74b26cd4e1a7517648
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 7ce9120c29d..47967c03890 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: d809494cdfc5]