From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 03 Sep 2020 21:48:56 GMT
Subject: Re: [PATCH v17] Support auto-merge for meld to follow the vim-diff behavior
Message-ID: <xmqq4koe8rav.fsf@gitster.c.googlers.com>
In-Reply-To: <xmqqv9idn2yr.fsf@gitster.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

> I have queued v16 (the one with the beginning of bool-or-str) with
> minimum fixups for issues I pointed out in the review of that
> revision queued on top of it as SQUASH??? commit.  Please find it in
> the 'seen' branch.
>
> Also,
>
>     Subject: Support auto-merge for meld to follow the vim-diff behavior
>
> needs fixing.
> ...

Anything new on this topic?  No rush, but I'd hate to see a
basically good topic to be left in the stalled state too long.

Thanks.