From owner-cvs-all Tue Jan 18 1:46:43 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 7893F14A05; Tue, 18 Jan 2000 01:46:41 -0800 (PST) (envelope-from ru@FreeBSD.org) Received: (from ru@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id BAA94635; Tue, 18 Jan 2000 01:46:41 -0800 (PST) (envelope-from ru@FreeBSD.org) Message-Id: <200001180946.BAA94635@freefall.freebsd.org> From: Ruslan Ermilov Date: Tue, 18 Jan 2000 01:46:40 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/gnu/usr.bin/grep grep.1 grep.c Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk ru 2000/01/18 01:46:40 PST Modified files: gnu/usr.bin/grep grep.1 grep.c Log: Fix conflicts. Revision Changes Path 1.15 +43 -13 src/gnu/usr.bin/grep/grep.1 1.19 +33 -6 src/gnu/usr.bin/grep/grep.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message