From owner-cvs-all Tue May 16 13:55:29 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 2F07037B55F; Tue, 16 May 2000 13:55:22 -0700 (PDT) (envelope-from wollman@FreeBSD.org) Received: (from wollman@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA51612; Tue, 16 May 2000 13:55:21 -0700 (PDT) (envelope-from wollman@FreeBSD.org) Message-Id: <200005162055.NAA51612@freefall.freebsd.org> From: Garrett Wollman Date: Tue, 16 May 2000 13:55:21 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mtree excludes.c Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG wollman 2000/05/16 13:55:20 PDT Modified files: (Branch: RELENG_4) usr.sbin/mtree excludes.c Log: Fix a mis-resolved conflict. Revision Changes Path 1.1.2.3 +1 -2 src/usr.sbin/mtree/excludes.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message