conflict file in *nix like systems

[Isaac Jurado]

On Sun, Nov 23, 2008 at 9:23 PM, Peter Pis <noelsunny at googlemail.com> wrote:
>
> But what in case merge was for example canceled. Mercurial still knows
> that such file should be resolved and status shows only it's modified.
> Is there any command that tells whether file is in conflict?

I don't think so.  At least using the current stable version.  As
mentioned by Bastian, use the imerge extensions for that.

Cheers.

-- 
Isaac Jurado Peinado
http://www.krenel.net

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci