From owner-cvs-all  Wed Nov  3 12:59:13 1999
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 3A13515517; Wed,  3 Nov 1999 12:59:10 -0800 (PST)
	(envelope-from billf@FreeBSD.org)
Received: (from billf@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id MAA92372;
	Wed, 3 Nov 1999 12:58:48 -0800 (PST)
	(envelope-from billf@FreeBSD.org)
Message-Id: <199911032058.MAA92372@freefall.freebsd.org>
From: Bill Fumerola <billf@FreeBSD.org>
Date: Wed, 3 Nov 1999 12:58:48 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin Makefile src/usr.sbin/mergemaster
         Makefile mergemaster.8 mergemaster.sh
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

billf       1999/11/03 12:58:48 PST

  Modified files:        (Branch: RELENG_3)
    usr.sbin             Makefile 
  Added files:           (Branch: RELENG_3)
    usr.sbin/mergemaster Makefile mergemaster.8 mergemaster.sh 
  Log:
  MFC: bring mergemaster into RELENG_3
  
  Revision  Changes    Path
  1.147.2.10 +2 -1      src/usr.sbin/Makefile



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