From: Junio C Hamano Date: Wed, 14 Sep 2005 16:30:06 GMT Subject: Re: Another merge test case from the kernel tree. Message-ID: <7vpsrbobn5.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Daniel Barkalow writes: > It shouldn't resolve it at all if it's case #16; I'll have to check on > that. Sorry my mistake; it did not.