From owner-cvs-all Wed Oct 20 13:10:39 1999 Delivered-To: cvs-all@freebsd.org Received: from jade.chc-chimes.com (jade.chc-chimes.com [216.28.46.6]) by hub.freebsd.org (Postfix) with ESMTP id 79E3E14CF9; Wed, 20 Oct 1999 13:10:32 -0700 (PDT) (envelope-from billf@jade.chc-chimes.com) Received: by jade.chc-chimes.com (Postfix, from userid 1001) id 973801C29; Wed, 20 Oct 1999 15:13:14 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by jade.chc-chimes.com (Postfix) with ESMTP id 8919D3817; Wed, 20 Oct 1999 15:13:14 -0400 (EDT) Date: Wed, 20 Oct 1999 15:13:14 -0400 (EDT) From: Bill Fumerola To: Doug Barton Cc: Bill Fumerola , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/usr.sbin/mergemaster - Imported sources In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk On Wed, 20 Oct 1999, Doug Barton wrote: > > Import mergemaster into the tree, a product of freebsdcon. > > Thanks Bill, I'll get back to you on that beer I owe you. :) Alfred Perlstien actually bought the alchohol that influenced that commit. -- - bill fumerola - billf@chc-chimes.com - BF1560 - computer horizons corp - - ph:(800) 252-2421 - bfumerol@computerhorizons.com - billf@FreeBSD.org - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message