From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Jun 2005 19:59:05 GMT
Subject: Re: [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally
Message-ID: <7vekba7zli.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vaclzclqd.fsf@assigned-by-dhcp.cox.net>

>>>>> "JCH" == Junio C Hamano <junkio@cox.net> writes:

JCH> So, yes I ended up arguing that the intelligent merge logic
JCH> could and probably needs to look at the trees involved ;-).

"Could look at, and probably be better off looking at," would
have been a better wording.

Linus, please discard the patches from me that you have not
applied about the "loosening of too strict index requirements"
(yesterday and the day before).  I think I am finally getting
somewhere but the solution, if it works, would be somewhat
different from what I have been sending you.