On Fri, Apr 15, 2011 at 01:45:35PM -0700, Junio C Hamano wrote: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > > >> I can't think of a case where it matters, though, so maybe it is just > >> paranoia. > > > > A line-counting, statistics tool would think that 1 line has been > > removed from both branches, and one new added by the merge. > > > > Well, I know no tool parsing combined diff actually, so it's indeed a > > hypothetical case. > > And the ones that have been parsing cdiff wouldn't have done anything good > before this change on such a binary blob anyway, no? No, but we can view the proposed change as fixing a bug for such a tool Whereas turning it into: --Binary blob XXX + Binary blob YYY +Binary blob ZZZ is codifying ambiguous output, and making the tool forever broken. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html