From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jun 2015 15:57:57 GMT
Subject: Re: Visualizing merge conflicts after the fact (using kdiff3)
Message-ID: <xmqqsi9pf1q2.fsf@gitster.dls.corp.google.com>
In-Reply-To: <5582B8EC.1060205@drmicha.warpmail.net>

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

> This type of request comes up often (for a reason). I'm wondering
> whether we could support it more systematically, either by exposing the
> steps above as a command, or by storing the unresolved merge somewhere
> (leveraging stash or rerere).

Perhaps 'tr/remerge-diff' (on 'pu') is of interest?