From: Junio C Hamano Date: Wed, 06 Mar 2013 20:40:48 GMT Subject: Re: feature suggestion: optimize common parts for checkout --conflict=diff3 Message-ID: <7vvc94p8hb.fsf@alter.siamese.dyndns.org> In-Reply-To: <20130306200347.GA20312@sigill.intra.peff.net> Jeff King writes: > then it will produce the output that Uwe expects. While it can be > misleading,... Misleading is one thing but in this case isn't it outright wrong? If you remove <<< ours ||| portion from the combined diff output, I would expect that the hunk will apply to the base, but that is no longer true, no?