Date: Sat, 28 Oct 1995 12:11:03 -0700 From: Peter Wemm <peter> To: CVS-commiters, cvs-gnu Subject: cvs commit: src/gnu/usr.bin/diff config.h context.c diff.c diff.h diff3.c dir.c getopt.c getopt1.c ifdef.c io.c sdiff.c side.c system.h util.c version.c fnmatch.c Message-ID: <199510281911.MAA10392@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 95/10/28 12:11:02
Modified: gnu/usr.bin/diff config.h context.c diff.c diff.h diff3.c
dir.c getopt.c getopt1.c ifdef.c io.c sdiff.c
side.c system.h util.c version.c
Removed: gnu/usr.bin/diff fnmatch.c
Log:
Merge in/out comflicts caused by Diffutils-2.7 import...
In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand. Not nice..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199510281911.MAA10392>