pgsql: Fix git whitespace warning - Mailing list pgsql-committers

From Peter Eisentraut
Subject pgsql: Fix git whitespace warning
Date
Msg-id E1umpxu-000fFu-1L@gemulon.postgresql.org
Whole thread Raw
List 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(-)


pgsql-committers by date:

Previous
From: Peter Eisentraut
Date:
Subject: pgsql: Add TAP tests for LDAP connection parameter lookup
Next
From: Masahiko Sawada
Date:
Subject: pgsql: Fix constant when extracting timestamp from UUIDv7.