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

[Stephane Bortzmeyer]

On Fri, Sep 16, 2005 at 10:17:08AM -0700,
 Matt Mackall <mpm at selenic.com> wrote 
 a message of 26 lines which said:

> Bryan's confusing this with another warning.
> 
> The above message means you've already done an update -m and now your
> working directory has two parents. A second update -m would cause you
> to have three parents and that isn't allowed: you have to commit.

Sorry, but Bryan's solution worked while yours is not possible. As I
said, "hg commit" exited immediately, without any message (which
probably meaned there was nothing to commit, which was consistent with
the output of "hg status").