From owner-cvs-all  Wed Aug 16  7: 2:34 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 772C137C586; Wed, 16 Aug 2000 07:02:31 -0700 (PDT)
	(envelope-from brian@FreeBSD.org)
Received: (from brian@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id HAA45568;
	Wed, 16 Aug 2000 07:02:30 -0700 (PDT)
	(envelope-from brian@FreeBSD.org)
Message-Id: <200008161402.HAA45568@freefall.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 16 Aug 2000 07:02:30 -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

brian       2000/08/16 07:02:30 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC: Use /usr/bin/less rather than /usr/local/bin/less and make the
       PAGER tests and texts more sane.
  
  Revision  Changes    Path
  1.6.2.1   +24 -12    src/usr.sbin/mergemaster/mergemaster.sh



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