From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 19 Feb 2011 00:44:24 GMT
Subject: Re: Merging limitations after directory renames -- interesting test repo
Message-ID: <7vwrkwn993.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTimKp+Z==QXJg2Bagot+Df4REeANuxwVi7bpPCXr@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> Ouch. I thought that commit wasn't _supposed_ to make any difference.
> If it does, then that sounds like a bad bug. Junio?

It already has been reverted.

I haven't really looked at the issue yet, but for one thing it seemed to
break synthesis of the virtual common tree inside merge-recursive for some
reason, and ends up producing a lot more diffs than necessary between the
common and the tips being merged.