Fri Feb 13 22:17:19 UTC 2004
? Makefile.conflict
? linklint-2.3.5
? template-de.html.Conflict
? template-ja.html.Conflict
? test.xml
? test.xsl
? Documentation/packages/pkginfo
? FAQ/make.err
? etc/namazu/mknmz.err
? etc/namazu/templates/cp-to-var-namazu-index.err
cvs server: Updating .
cvs server: [23:17:25] waiting for xemacs's lock in /pack/xemacscvs/XEmacs/xemacsweb
cvs server: [23:17:55] obtained lock in /pack/xemacscvs/XEmacs/xemacsweb
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.199
Merging differences between 1.197 and 1.199 into ChangeLog
rcsmerge: warning: conflicts during merge
cvs [update aborted]: cannot rename file .new.ChangeLog to ChangeLog: No such file or directory
Fri Feb 13 22:18:20 UTC 2004