[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS: cvs.openbsd.org: src



CVSROOT:	/cvs
Module name:	src
Changes by:	niallo_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2007/06/02 03:00:20

Modified files:
	usr.bin/cvs    : entries.c 

Log message:
don't try to parse a server conflict message as a date.
makes cvs remote merging with conflicts work a bit better.

ok joris@ xsa@



Visit your host, monkey.org