pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  

help / color / mirror / Atom feed

From: Peter Eisentraut <peter@eisentraut.org>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Fix git whitespace warning
Date: Fri, 15 Aug 2025 08:39:10 +0000
Message-ID: <E1umpxu-000fFm-18@gemulon.postgresql.org> (raw)

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
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/2e2e7ff7b891fcb880c1c221e41208dcb0787290

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

view thread (5+ messages)  latest in thread

Message-ID: <E1umpxu-000fFm-18@gemulon.postgresql.org>
Permalink:  ../E1umpxu-000fFm-18@gemulon.postgresql.org/
Also on:    postgresql.org/message-id/E1umpxu-000fFm-18@gemulon.postgresql.org

copy link · copy postgr.es

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-committers@postgresql.org
  Cc: peter@eisentraut.org, pgsql-committers@lists.postgresql.org
  Subject: Re: pgsql: Fix git whitespace warning
  In-Reply-To: <E1umpxu-000fFm-18@gemulon.postgresql.org>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox