[PATCH STABLE] tag: fix uncommitted merge check and error message

[Matt Mackall]

On Tue, 2010-12-07 at 16:41 +0100, Adrian Buehlmann wrote:
> +tagging with a uncommitted merge
> +
> +  $ hg init r4
> +  $ cd r4
> +  $ echo c1 > f1 
> +  $ hg add f1
> +  $ hg ci -m0
> +  $ echo foo >> f1
> +  $ hg ci -m1
> +  $ hg up -q 0
> +  $ echo c2 > f2
> +  $ hg add f2
> +  $ hg ci -m2
> +  created new head

That's a lot of extra work to make an uncommitted merge. Surely the test
already creates a repo with two heads at some point?

-- 
Mathematics is the supreme nostalgia of our time.