Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant

From: Seth House <seth@eseth.com>
Date: Feb 27, 2021, 02:17 UTC
Message-ID: <YDmrwVQAwlzCVOO4@ellen>
In-Reply-To: <xmqqblc6qnu1.fsf@gitster.g>

On Fri, Feb 26, 2021 at 05:52:22PM -0800, Junio C Hamano wrote:

> I think that is exactly what we have on sh/mergetools-vimdiff1 topic
> branch in 'next'.

Oh, whoops. Thanks! I'll get into the habit of watching 'next' more closely.

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