From owner-cvs-all  Sat Oct  7  4:20: 6 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id E80FC37B502; Sat,  7 Oct 2000 04:20:01 -0700 (PDT)
Received: (from alfred@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id EAA10121;
	Sat, 7 Oct 2000 04:20:01 -0700 (PDT)
	(envelope-from alfred@FreeBSD.org)
Message-Id: <200010071120.EAA10121@freefall.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Sat, 7 Oct 2000 04:20:01 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: RELENG_4
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

alfred      2000/10/07 04:20:01 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Bring in my mergemaster mega-patch for better interaction with
  users, also bring in several fixes that were done to my patch.
  Version 1.10 was pre-MFC'd.
  
  MFC: 1.7 (mega), 1.8 (fix), 1.9 (fix)
  
  Revision  Changes    Path
  1.6.2.3   +157 -109  src/usr.sbin/mergemaster/mergemaster.sh



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