From owner-freebsd-current  Wed Jan  6 20:56:41 1999
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id UAA02774
          for freebsd-current-outgoing; Wed, 6 Jan 1999 20:56:41 -0800 (PST)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from adelphi.physics.adelaide.edu.au (adelphi.physics.adelaide.edu.au [129.127.36.247])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id UAA02762
          for <current@freebsd.org>; Wed, 6 Jan 1999 20:56:37 -0800 (PST)
          (envelope-from kkennawa@physics.adelaide.edu.au)
Received: from bragg (bragg [129.127.36.34])
	by adelphi.physics.adelaide.edu.au (8.8.8/8.8.8/UofA-1.5) with SMTP id PAA07468;
	Thu, 7 Jan 1999 15:26:06 +1030 (CST)
Received: from localhost by bragg; (5.65/1.1.8.2/05Aug95-0227PM)
	id AA23174; Thu, 7 Jan 1999 15:26:05 +1030
Date: Thu, 7 Jan 1999 15:26:04 +1030 (CST)
From: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
X-Sender: kkennawa@bragg
To: Neal Westfall <nwestfal@vorlon.odc.net>
Cc: current@FreeBSD.ORG
Subject: Re: mergemaster should be merged in to the main tree. 
In-Reply-To: <Pine.LNX.4.04.9901062027360.32525-100000@Vorlon.odc.net>
Message-Id: <Pine.OSF.4.05.9901071525370.2744-100000@bragg>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Wed, 6 Jan 1999, Neal Westfall wrote:

> So where would a person get this mergemaster?  Thanks.

/usr/ports/sysutils/mergemaster

Kris

-----
(ASP) Microsoft Corporation (MSFT) announced today that the release of its 
productivity suite, Office 2000, will be delayed until the first quarter
of 1901.


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