From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2017 19:45:31 GMT
Subject: Re: show all merge conflicts
Message-ID: <xmqqr32jwh7o.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <6ff25254-720e-5b85-ba6d-22b16e91b354@drmicha.warpmail.net>

Michael J Gruber <git@drmicha.warpmail.net> writes:

> If you're curious, I kept rebasing Thomas' remerge-diff (on top of our
> next) so far. You can find it at
>
> https://github.com/mjg/git/tree/remerge-diff

;-).
Yes, this was a good one.  


> if you're interested. I don't know what problems were found back then,
> or what it would take to get this in-tree now.

If I recall correctly, everybody was in favor of what it does (or at
least attempted to do), but was leaky and not ready for "log -p" to
be used on a long stretch of history or something?