From owner-freebsd-stable  Mon Aug 30  1: 3:19 1999
Delivered-To: freebsd-stable@freebsd.org
Received: from dt011n65.san.rr.com (dt010nb9.san.rr.com [204.210.12.185])
	by hub.freebsd.org (Postfix) with ESMTP
	id 395BF15124; Mon, 30 Aug 1999 01:03:15 -0700 (PDT)
	(envelope-from Doug@gorean.org)
Received: from gorean.org (master [10.0.0.2])
	by dt011n65.san.rr.com (8.9.3/8.8.8) with ESMTP id BAA01631;
	Mon, 30 Aug 1999 01:01:03 -0700 (PDT)
	(envelope-from Doug@gorean.org)
Message-ID: <37CA3A3E.2C012846@gorean.org>
Date: Mon, 30 Aug 1999 01:01:02 -0700
From: Doug <Doug@gorean.org>
Organization: Triborough Bridge & Tunnel Authority
X-Mailer: Mozilla 4.6 [en] (Win98; I)
X-Accept-Language: en
MIME-Version: 1.0
To: freebsd-questions@freebsd.org, freebsd-stable@freebsd.org
Subject: $FreeBSD-friendly version of mergemaster available
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

	For those who are not aware, the CVS $Id tags in our tree have been
changed to $FreeBSD for both -Current and -Stable. Because mergemaster
relies on these tags I've added that functionality to it. However I have
some other changes planned, so I'm not ready to re-roll the port yet. 

	If you plan to upgrade between now and 3.3-Release you can grab the new
version at http://freebsd.simplenet.com/mergemaster-1.25. 

Enjoy,

Doug


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