From: Junio C Hamano <junkio@cox.net>
Date: Sat, 07 May 2005 18:42:15 GMT
Subject: Re: Broken adding of cache entries
Message-ID: <7vu0leaneg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050507152849.GD9495@pasky.ji.cz>

I'll have a look later but as I recall the code (I'm writing
this without looking at the specific code, just your patch
hunk), the flag comparison there is not about blob vs tree modes
but for "stages"; it must answer that two entries with the same
name but in different merge stages are different.