[PATCH 2 of 2 STABLE V2] tag: fix uncommitted merge check and error message (issue2542)

[Matt Mackall]

On Tue, 2010-12-14 at 11:44 -0600, Kevin Bullock wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1291705374 -3600
> # Branch stable
> # Node ID 3492561282bcda8e2d983607fa50493822beb48c
> # Parent  d3e7418583b79096a6e6a6c02e3329de02a1fe1a
> tag: fix uncommitted merge check and error message (issue2542)

These two are queued, thanks.

-- 
Mathematics is the supreme nostalgia of our time.