Display conflicts to be resolved.

[John Levon]

On Tue, Aug 07, 2007 at 10:43:45AM +0200, Frank Bauer wrote:

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

I think you'd prefer to use the imerge extension.

> 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.)

The argument goes that hg itself should not know about conflict markers
(and therefore shouldn't warn you when you commit them, etc.). It's
still a mystery to me why this should be so :)

john