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

quoted

quoted

quoted

quoted

"JCH" == Junio C Hamano [off-list ref] 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.