From: Junio C Hamano Date: Fri, 15 Apr 2011 20:45:35 GMT Subject: Re: textconv not invoked when viewing merge commit Message-ID: <7v7havckgg.fsf@alter.siamese.dyndns.org> In-Reply-To: Matthieu Moy 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?