Module Name:	gnusrc
Committed By:	wiz
Date:		Thu Oct 26 14:59:09 UTC 2000

Modified Files:
	gnusrc/gnu/dist/cvs/doc: cvs.texinfo
	gnusrc/gnu/dist/cvs/lib: getdate.c
	gnusrc/gnu/dist/cvs/man: cvs.1
	gnusrc/gnu/dist/cvs/src: checkout.c client.c commit.c cvs.h history.c
	    lock.c logmsg.c main.c mkmodules.c parseinfo.c rcs.c recurse.c
	    server.c tag.c update.c

Log Message:
resolve conflicts from cvs-1.11 import


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/cvs/doc/cvs.texinfo
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/cvs/lib/getdate.c
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/cvs/man/cvs.1
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/cvs/src/checkout.c \
    gnusrc/gnu/dist/cvs/src/commit.c gnusrc/gnu/dist/cvs/src/history.c \
    gnusrc/gnu/dist/cvs/src/lock.c gnusrc/gnu/dist/cvs/src/logmsg.c \
    gnusrc/gnu/dist/cvs/src/mkmodules.c gnusrc/gnu/dist/cvs/src/parseinfo.c \
    gnusrc/gnu/dist/cvs/src/recurse.c gnusrc/gnu/dist/cvs/src/tag.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/cvs/src/client.c \
    gnusrc/gnu/dist/cvs/src/cvs.h gnusrc/gnu/dist/cvs/src/main.c \
    gnusrc/gnu/dist/cvs/src/server.c gnusrc/gnu/dist/cvs/src/update.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/cvs/src/rcs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.