From owner-cvs-all  Mon May 28  2:46:24 2001
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 C0EBE37B43C; Mon, 28 May 2001 02:46:19 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f4S9kJV41690;
	Mon, 28 May 2001 02:46:19 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200105280946.f4S9kJV41690@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 28 May 2001 02:46:19 -0700 (PDT)
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
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dougb       2001/05/28 02:46:18 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Be more consistent with the terminology, referring to "temporary and
  installed" instead of "old and new". Inspired by the somewhat
  non-linear PR, which really didn't have a fix, per se.
  
  PR:		conf/27235 Roelof Osinga <roelof@eboa.com>
  
  Revision  Changes    Path
  1.21      +3 -3      src/usr.sbin/mergemaster/mergemaster.sh


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