From owner-cvs-all  Wed Oct 20  0:22:58 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 AB4AA1AF4C; Wed, 20 Oct 1999 00:22:54 -0700 (PDT)
	(envelope-from billf@FreeBSD.org)
Received: (from billf@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA59345;
	Wed, 20 Oct 1999 00:22:53 -0700 (PDT)
	(envelope-from billf@FreeBSD.org)
Message-Id: <199910200722.AAA59345@freefall.freebsd.org>
From: Bill Fumerola <billf@FreeBSD.org>
Date: Wed, 20 Oct 1999 00:22:53 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster - Imported sources
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

billf       1999/10/20 00:22:53 PDT

  src/usr.sbin/mergemaster - Imported sources
  Update of /home/ncvs/src/usr.sbin/mergemaster
  In directory freefall.freebsd.org:/d/users/billf/mergemaster/mm
  
  Log Message:
  Import mergemaster into the tree, a product of freebsdcon.
  
  Submitted by: 	Doug Barton <doug@gorean.org>
  
  Status:
  
  Vendor Tag:	BARTON
  Release Tags:	r0_36
  		
  N src/usr.sbin/mergemaster/mergemaster
  N src/usr.sbin/mergemaster/mergemaster.8
  
  No conflicts created by this import
  


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