From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jun 2015 16:19:36 GMT
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Message-ID: <xmqqwpyzacx3.fsf@gitster.dls.corp.google.com>
In-Reply-To: <5583D40F.7030300@drmicha.warpmail.net>

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

> Junio C Hamano venit, vidit, dixit 18.06.2015 17:57:
>> 
>> Perhaps 'tr/remerge-diff' (on 'pu') is of interest?
>
> I haven't reviewed remerge-diff but merged it on top of my own local
> additions and ran the full test suite successfully. Any big blocker to
> watch out for?

"What's cooking" report marks it as "Waiting for a
reroll. ($gmane/256591)."

So 

  http://thread.gmane.org/gmane.comp.version-control.git/256591

would be the first place to revisit.