CVS: herc.mirbsd.org: src

Commit ID:	1004F31A90D22371E46
CVSROOT:	/cvs
Module name:	src
Changes by:	tg@...	2012/02/07 22:43:04 UTC

Modified files:
	gnu/usr.bin/cvs/diff: diff3.c
	gnu/usr.bin/cvs/src: main.c

Log message:
sync with debian -8

To generate a diff of this changeset, execute the following commands:
cvs -R rdiff -kk -upr1.5 -r1.6 src/gnu/usr.bin/cvs/diff/diff3.c
cvs -R rdiff -kk -upr1.14 -r1.15 src/gnu/usr.bin/cvs/src/main.c