pgsql: Fix git whitespace warning

From: Peter Eisentraut <peter(at)eisentraut(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Fix git whitespace warning
Date: 2025-08-15 08:39:10
Message-ID: E1umpxu-000fFu-1L@gemulon.postgresql.org
Views: Whole Thread | Raw Message | Download mbox | Resend email
Thread:
Lists: pgsql-committers

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.

Branch
------
REL_15_STABLE

Details
-------
https://git.postgresql.org/pg/commitdiff/82f99688240fa4a870e332e05d564ca6e4cca075

Modified Files
--------------
.gitattributes | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Masahiko Sawada 2025-08-15 18:59:30 pgsql: Fix constant when extracting timestamp from UUIDv7.
Previous Message Peter Eisentraut 2025-08-15 08:23:12 pgsql: Add TAP tests for LDAP connection parameter lookup