From: Jeff King <peff@peff.net>
Date: Thu, 04 Apr 2013 20:54:23 GMT
Subject: Re: feature suggestion: optimize common parts for checkout --conflict=diff3
Message-ID: <20130404205423.GA25986@sigill.intra.peff.net>
In-Reply-To: <20130404204944.GB4913@pengutronix.de>

On Thu, Apr 04, 2013 at 10:49:44PM +0200, Uwe Kleine-König wrote:

> On Thu, Apr 04, 2013 at 04:33:44PM -0400, Jeff King wrote:
> > [...]
> > So I do think zdiff3 is useful, and I plan to continue using it.
> Thanks for your description. I'm using and liking zdiff3, too. So I'd
> really like seeing it in vanilla git.

I don't know if Junio is interested in taking a patch with the concept
or not, but as I recall, your patch needed at least a documentation
update before it could be picked up. Unless Junio wants to say "no, I am
not interested at all", I think the next step would be to repost an
updated version.

-Peff