From owner-cvs-all  Sat Aug 26  5:15:28 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id A3F8237B422; Sat, 26 Aug 2000 05:15:25 -0700 (PDT)
Received: (from ben@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA04585;
	Sat, 26 Aug 2000 05:15:25 -0700 (PDT)
	(envelope-from ben@FreeBSD.org)
Message-Id: <200008261215.FAA04585@freefall.freebsd.org>
From: Ben Smithurst <ben@FreeBSD.org>
Date: Sat, 26 Aug 2000 05:15:25 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

ben         2000/08/26 05:15:25 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Make mergemaster ignore files in /dev if /dev is a devfs.
  
  Approved by:	Doug Barton <Doug@gorean.org>
  
  Revision  Changes    Path
  1.11      +7 -2      src/usr.sbin/mergemaster/mergemaster.sh



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message