From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 06 Sep 2009 21:11:55 GMT
Subject: Re: Strange merge failure (would be overwritten by merge / cannot merge)
Message-ID: <7vzl97ye04.fsf@alter.siamese.dyndns.org>
In-Reply-To: <alpine.LFD.2.01.0909061338350.8946@localhost.localdomain>

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

> The index case is slightly easier, as we can go back-and-forth in the 
> source index (we do try to avoid it right now, but that's a small 
> optimization rather than anything fundamental),...

Almost true, but there is the final "Any left-over entries in the index?"
phase in unpack_trees() that relies on o->pos being correct.