On Tue, Aug 26, 2014 at 6:53 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Yes---that is what I meant by the "virtual stuff". Unlike resolve
> work by Daniel (around Sep 2005 $gmane/8088) that tried to use
> multiple ancestors directly in a single merge, recursive limits
> itself to repeated use of pairwise merges.
Ok, I see now. Then what about checking also in check_ce_order() that
only stage #1 can be repeated?
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html