[cvsnt] $Log$ conflict

[Tom Cmok]

Community technical support mailing list was retired 2010 and replaced with a professional technical support team.  For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
 
Hi all,

I'm having a problem with a conflict after cvs merge (after update) 
in the $Log$ section. Local file's log looks as follows:


$Log: reporttasks.txt,v $
Revision 1.6  2003/07/27 11:34:19  cvsJason
no message

..
..

then, after update, when other uses did commit in the meantime, I'm 
getting this:

<<<<<<< reporttasks.txt
$Log: reporttasks.txt,v $
=======
$Log$
Revision 1.7  2003/07/27 13:56:58  cvsTomasz
updated

>>>>>>> 1.7

why is that - it shouldn't happen, should it?

CVSNT 2.0.3

Tomasz