Module Name:	gnusrc
Committed By:	wiz
Date:		Sun Feb 27 00:43:39 UTC 2000

Modified Files:
	gnusrc/gnu/dist/grep/doc: grep.1 grep.texi
	gnusrc/gnu/dist/grep/src: grep.c
Removed Files:
	gnusrc/gnu/dist/grep: PATCHES-AC
	gnusrc/gnu/dist/grep/src: btowc.c

Log Message:
handle conflicts between grep-2-3 and grep-2-4


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r0 gnusrc/gnu/dist/grep/PATCHES-AC
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/grep/doc/grep.1
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/grep/doc/grep.texi
cvs rdiff -r1.1.1.1 -r0 gnusrc/gnu/dist/grep/src/btowc.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/grep/src/grep.c

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