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

[Dirkjan Ochtman]

On Wed, Jun 16, 2010 at 16:13, Matt Mackall <mpm at selenic.com> wrote:
> abort: dude, merging with an ancestor is a pointless no-op (think about
> it)
>
> or perhaps:
>
> abort: merging with ancestor has no effect

I actually think the latter is an improvement.

Cheers,

Dirkjan