Cannot update "outstanding uncommitted merges" but there are none such merges

[Stephane Bortzmeyer]

On Fri, Sep 16, 2005 at 07:17:07AM -0700,
 Bryan O'Sullivan <bos at serpentine.com> wrote 
 a message of 11 lines which said:

> Use "hg heads" to see how many heads your repository has.  

It has two heads.

> heads using "hg update REV" or "hg update -C REV" and try the merge
> and commit again.

-C was necessary but now it works. There is now only one head. Now, I
will try to understand what happened. (Mercurial seems extremely
complicated to me when I compare to the darcs model "one repository,
one branch, one working copy".)