Display conflicts to be resolved.

[Frank Bauer]

Hi,

I'm using mercurial 0.9.4
 and I can't find a way to display files with conflicts that need to
be resolved.

When I hg pull from the master repository and then call hg merge, I can
resolve the conflicts in the editor just fine.
However sometimes I'm just not prepared to do the full
merge right now so I resolve only some trivial conflicts and postpone the
harder ones for later time. Now is there some command (I expected
hg status) to show which files contain conflicts and therefore need
some care? (IIRC I saw something like that in subversion
and maybe bzr.)

Thanks,

Frank Bauer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20070807/d2112254/attachment.htm