From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu, 04 Apr 2013 20:49:44 GMT
Subject: Re: feature suggestion: optimize common parts for checkout --conflict=diff3
Message-ID: <20130404204944.GB4913@pengutronix.de>
In-Reply-To: <20130404203344.GA25330@sigill.intra.peff.net>

Hi Jeff,

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.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |