[cvsnt] minor Bug in update in Build 1927

[Richard Wirth]

Hello Tony,

Build 1927 and update of a file modified by another party I gat
conflicts:

RCS file: /home/cvs/repo1/Dmakefile,v
retrieving revision 1.13
retrieving revision 1.14
Merging differences between 1.13 and 1.14 into Dmakefile
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in Dmakefile

File contents:

<<<<<<< Dmakefile
;;; $Header: /home/cvs/repo1/Dmakefile,v 1.11 2003/10/16 14:28:07 me Exp $
=======
;;; $Header: /home/cvs/repo1/Dmakefile,v 1.14 2005/04/05 13:01:57 other Exp $
>>>>>>> 1.14


This is the only conflict! So why is this a conflict at all??

cvs version
Client: Concurrent Versions System (CVSNT) 2.5.01 (Travis) Build 1904 (Release Candidate 4) (client/server)
Server: Concurrent Versions System (CVSNT) 2.5.01 (Travis) Build 1927 (client/server)



-- 
Best regards,
 Richard                          mailto:r.wirth at wirthware.de