newbie question on hg update

[Gilles Moris]

On Thursday 12 May 2011 09:29:18 pm marwie wrote:
> Nope, no conflict. Just the output I posted:
>
> merging test.txt
> 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
>
> Lasse Vågsæther Karlsen wrote:
> > On Thu, May 12, 2011 at 20:59, marwie <marwie at gmx.de> wrote:
> >
> > Did you get a merge conflict when you updated, or did it update cleanly?
> >
> > --
> > Lasse Vågsæther Karlsen

Which version of mercurial are running ?
$ hg version

I cannot reproduce the problem with the latest hg 1.8.3, but I can if I go 
back to hg 1.5. Possibly fix in 1.6 so.

Regards.
Gilles.