From owner-cvs-all  Wed Aug  9 13:36:19 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 32CC537B561; Wed,  9 Aug 2000 13:36:17 -0700 (PDT)
	(envelope-from brian@FreeBSD.org)
Received: (from brian@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA40722;
	Wed, 9 Aug 2000 13:36:17 -0700 (PDT)
	(envelope-from brian@FreeBSD.org)
Message-Id: <200008092036.NAA40722@freefall.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 9 Aug 2000 13:36:16 -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
X-Loop: FreeBSD.ORG

brian       2000/08/09 13:36:16 PDT

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Be more careful about selecting a PAGER.
  Improve the question asked when the PAGER is invalid.
  
  Submitted by: Doug Barton <DougB@gorean.org>
  
  Revision  Changes    Path
  1.9       +15 -8     src/usr.sbin/mergemaster/mergemaster.sh



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