Re: Strange merge failure (would be overwritten by merge / cannot merge)

Linus Torvalds [off-list ref] writes:

Grr. I need to go off and do some other things, and this still fails a few 
tests...
[ In other words: in this version, we only do a single-entry lookahead, 
  exactly like we used to do before. So this is not meant to _fix_ 
  anything, or change any semantics. It's an incremental "change the model 
  so that we can look ahead more in a future patch" patch.

  But it's broken, and I have to run away for a while. ]

That's okay.  I myself have to go and give a final review to the galley
proof of my book, before the publisher gives a go to the printing press
now.

I do not think we are in a hurry, as this issue, as far as I can tell, has
been with us from early days of git; I would say for the whole lifetime of
the unpack_trees() interface, but I didn't check.