Re: [PATCH 7/5] merge-ll: report an error when reading external merge results fails

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 30, 2026, 18:01 UTC
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?

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.