C:\Program Files\Zend\bin\cvs.exe update  C:\mattscvsroot\test\test\helloworld.php
RCS file: /kudos/apps/CVSROOT/test/test/helloworld.php,v

retrieving revision 1.5

retrieving revision 1.6

Merging differences between 1.5 and 1.6 into helloworld.php

rcsmerge: warning: conflicts during merge

cvs.exe [update aborted]: cannot rename file .new.helloworld.php to helloworld.php: File exists


cvs command finished with exit code 1