On Thu, Apr 5, 2012 at 8:59 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jon Seymour <jon.seymour@xxxxxxxxx> writes: > >> Are there any flaws, I wonder? > > It all depends on how close the base is to M^1. The difference might make > it unnecessary (or even more necessary) to do any evil merge. True. I guess it is still true there are no perfect solutions in this area. This does seem like a step in a better direction, though. jon. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html