[PATCH] merge: give clearer error messages when there is nothing to merge

Matt Mackall mpm at selenic.com
Sun Jun 20 15:01:04 CDT 2010

On Sun, 2010-06-20 at 11:01 +0200, Dirkjan Ochtman wrote:
> On Sun, Jun 20, 2010 at 01:11, Matt Mackall <mpm at selenic.com> wrote:
> > abort: merging with a working directory ancestor has no effect
> Sounds great to me.

Ok, pushed.

Mathematics is the supreme nostalgia of our time.

More information about the Mercurial-devel mailing list