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

[Dirkjan Ochtman]

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.

Cheers,

Dirkjan