Display conflicts to be resolved.

[John Levon]

On Wed, Aug 08, 2007 at 05:35:59PM -0700, Jens Alfke wrote:

> >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 :)
> 
> I can understand about the ">>>" etc. marker text. But shouldn't hg  
> have a special file status to indicate a file that has unresolved  
> conflicts? Both CVS and SVN do.

It would be nice, but I think you'll still be told to use the imerge
extension.

> If so, how do you cancel the merge halfway through when you're sitting  
> in an external merge-viewer utility? Do you go back to the shell that  
> has hg running and Ctrl-C it? Will that back out everything that  
> happened so far?

Without the above extension, it's pretty miserable...

regards
john