From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Sep 2026 18:01:28 GMT
Subject: Re: [PATCH 7/5] merge-ll: report an error when reading external merge results fails
Message-ID: <xmqq8q4ibouf.fsf@gitster.g>
In-Reply-To: <20260929214943.GA1735259@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> Here's a resend of that final patch (not just a squash, because the
> commit message mentioned the chmod).

Makes sense.

These 6/5 and 7/5 are probably better squashed into 5/5 than left as
"oops that was bad, so here is a preliminary clean-up to make the
fix easier (6/5), and here is the fix of the fifth step (7/5)", no?