Two heads?

[Mads Kiilerich]

Joseph Turian wrote, On 07/12/2009 07:29 PM:
> Somehow I ended up with a repository with two heads:
>
> @  changeset:   40:eeb915309a23
> |  tag:         tip
> |  parent:      36:b2e90abb1c66
> |  user:        Joseph Turian<turian at iro.umontreal.ca>
> |  date:        Sun Jul 12 13:06:28 2009 -0400
> |  summary:     Merge
> |
> | o  changeset:   39:c6eced54cb31
> | |  user:        Joseph Turian<turian at iro.umontreal.ca>
> | |  date:        Sat Jul 11 12:54:07 2009 -0400
> | |  summary:     Added instructions about case intact preprocessing
>
> How do I merge them?
>
> If I try:
> $ hg merge
> abort: outstanding uncommitted changes
>
> If I try:
> $ hg commit
> nothing changed
>    

What is the output of
hg --version
hg status

/Mads