Re: [PATCH 3/3] read-tree -m 3-way: handle more trivial merges internally

From: Junio C Hamano <junkio@cox.net>
Date: 2005-06-11 05:59:05
>>>>> "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.




-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sat Jun 11 06:00:48 2005

This archive was generated by hypermail 2.1.8 : 2005-06-11 06:00:51 EST