Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views

From: Seth House <seth@eseth.com>
Date: Dec 18, 2020, 02:35 UTC
Message-ID: <20201218023534.GA117762@ellen>
In-Reply-To: <5fdc0e6dd79a7_f2faf208a1@natae.notmuch>

On Thu, Dec 17, 2020 at 08:05:33PM -0600, Felipe Contreras wrote:

> > Would you mind switching the autoMerge option to be per-tool rather than
> > under the main mergetool config section?
> 
> As I said; I don't see the point.

I know you've said that. But I would prefer that, and Junio requested that, and other people may prefer that as well. Since it's not too much trouble to make the option per-tool with a global fallback, and since Junio already provided example code to do that, do you mind adding it anyway even though you don't see the point?

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