CVS commit: src

[Simon Burge <simonb%netbsd.org@localhost>]

Module Name:    src
Committed By:   simonb
Date:           Sat Feb 20 11:34:29 UTC 1999

Modified Files:
        src/gnu/dist/grep/doc: grep.texi
        src/gnu/dist/grep/src: grep.c
Log Message:
Resolve conflicts from import.