Re: [PATCH v9 5/5] mergetool: add automerge_enabled tool-specific override function

From: Seth House <seth@eseth.com>
Date: Jan 7, 2021, 09:27 UTC
Message-ID: <20210107092716.GA548935@ellen>
In-Reply-To: <xmqqy2h5meum.fsf@gitster.c.googlers.com>

On Wed, Jan 06, 2021 at 10:38:09PM -0800, Junio C Hamano wrote:

> By the way, do you have any idea why we see test breakages only on
> macos when this topic is merged to 'seen'?

Thanks for those links. I have an OSX machine nearby and will investigate tomorrow.

Related: are the Windows tests affected by this patch? I wanted to check
for myself but I've been struggling with getting Git-for-Windows
installed in a VM.

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