[cvsnt] "C <filename>" vs "warning: conflict"

[Arthur Barrett]

Andreas,

>> From memory there are three cases for 'C' conflict:
>> 1) when the file can be merged
>
> If the file can be merged, the 'C' does IMHO not appear.

I know English good - I learnt from book.  I meant:

1) the file is a mergeable file but there was a conflict generated during 
the merge.

Regards,


Arthur