From: Seth House <seth@eseth.com>
Date: Sat, 27 Feb 2021 02:17:37 GMT
Subject: Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant
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.