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

Seth House [off-list ref] writes:

On Thu, Feb 25, 2021 at 06:04:53PM -0800, Junio C Hamano wrote:

quoted

Seth House [off-list ref] writes:

quoted

I'll roll those into this patch.

I'd rather see it as a completely separate patch.

Ok, will do.

Should I roll a v2 of this patch set to include David's tested-by tag
even though there's no code changes?

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

    $ git fetch
    $ git show 'origin/next^{/^mergetools/vimdiff:}'

Thanks.

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.