Re: [PATCH] mergetool: do not enable hideResolved by default

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 12, 2021, 23:36 UTC
Message-ID: <xmqqh7lg54h4.fsf@gitster.g>
In-Reply-To: <YEv5d0pGvEVpepoY@google.com>

Jonathan Nieder <jrnieder@gmail.com> writes:

Show 5 quoted lines

>> Any progress here?
>
> Sorry for the delay.  I should be able to send out an improved log
> message (more concise and summarizing the supporting info from this
> thread) later this afternoon.

Thanks. I think this is the last known regression in the -rc, and an update before the final happens on coming Monday is very much appreciated.

$ 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.