[PATCH 0 of 1] Allow merging different-branch ancestors

Matt Mackall mpm at selenic.com
Thu Jan 1 16:26:27 CST 2009

On Thu, 2009-01-01 at 20:40 +0100, Dirkjan Ochtman wrote:
> Here's a patch that allows merging named branches where the common ancestor is
> one of the parents. It was formerly allowed only for one of the parents,
> which seemed kind of weird.

Huh? I need a picture.

>  test-issue619 seems to validate that part, so this
> patch breaks it. Not sure why fast-forwarding is disallowed for this case.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial-devel mailing list