From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Jul 2020 20:18:21 GMT
Subject: Re: Improving merge of tricky conflicts
Message-ID: <xmqqblk4ll9u.fsf@gitster.c.googlers.com>
In-Reply-To: <20200724194840.GA4013174@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> My big challenge now will be remembering to try to use this next time I
> run into a conflict that could be helped by it. :)

Yup, I installed it in ~/bin so that I can pipe diff3 result to it
for the next time.  Thanks.