From owner-cvs-all  Tue Oct 31 23:22: 0 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 AC10137B663; Tue, 31 Oct 2000 23:21:56 -0800 (PST)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id XAA79709;
	Tue, 31 Oct 2000 23:21:56 -0800 (PST)
	(envelope-from dougb@FreeBSD.org)
Message-Id: <200011010721.XAA79709@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 31 Oct 2000 23:21:56 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

dougb       2000/10/31 23:21:56 PST

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Reorder one of the new features based on experience. Since the number
  of files auto-installed during an upgrade from a really old system
  can get quite long, and it's piped to the PAGER already, print
  that first, then print any of the 4 two-line messages that might
  apply.
  
  Revision  Changes    Path
  1.15      +13 -13    src/usr.sbin/mergemaster/mergemaster.sh



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