Re: [PATCH 3/8] git-merge-recursive-{ours,theirs}

Junio C Hamano [off-list ref] writes:

Avery Pennarun [off-list ref] writes:

quoted

quoted

I've queued the series with minor fixes to 'pu' and pushed it out.

Since I see you didn't change a couple of things you mentioned in
earlier comments (the NEEDSWORK comment and the sq-then-eval trick) do
you still want me to respin this series?

The commit still is NEEDSWORK and shouldn't be in 'next' in its current
shape.

Oh, I think you meant the "NEEDSWORK -- we limit to depth 2 when we
guess" and that has been with us ever since we added subtree merge, and it
is no reason to block the topic.  I had the sq-then-eval stuff in mind
when I wrote above.

Sorry for the confusion.