Merge not as expected

Matt Mackall mpm at
Mon Sep 26 19:23:18 CDT 2005

On Sun, Sep 25, 2005 at 09:48:50PM -0700, Matt Mackall wrote:
> So it looks like there's a lurking bug in the ancestor algorithm still.
> I'll try to sort this out tomorrow.

Should be fixed in tip.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial mailing list