From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Mar 2012 04:56:14 GMT
Subject: Re: [PATCH 0/2] merging renames of empty files
Message-ID: <7vehsjvrtd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120323002300.GA15940@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Thu, Mar 22, 2012 at 04:37:05PM -0700, Junio C Hamano wrote:
>
>> Hrm. As this is probably useful for older maintenance track, I would have
>> preferred not to see the first one that touches sequencer.c that did not
>> exist in the 1.7.7.x maintenance track, as the change is purely "cosmetic"
>> and does not have anything to do with fixing the over-agressive merge.
>
> I considered that, but assumed this was not a maint fix, but rather a
> new "feature" to improve the heuristics.

Ok. Perhaps I over-reacted to the issue, which sounded like a grave
mismerge that can go unnoticed.