Re: feature suggestion: optimize common parts for checkout --conflict=diff3
From: Junio C Hamano <hidden> Date: 2016-06-15 22:56:19
Jeff King [off-list ref] 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?