From owner-svn-src-stable@FreeBSD.ORG  Thu Dec 20 00:30:49 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 14E54C37;
 Thu, 20 Dec 2012 00:30:49 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ED50F8FC16;
 Thu, 20 Dec 2012 00:30:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBK0Um54021761;
 Thu, 20 Dec 2012 00:30:48 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBK0UmYA021760;
 Thu, 20 Dec 2012 00:30:48 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212200030.qBK0UmYA021760@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 20 Dec 2012 00:30:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r244461 - stable/9/usr.sbin/mergemaster
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 00:30:49 -0000

Author: eadler
Date: Thu Dec 20 00:30:48 2012
New Revision: 244461
URL: http://svnweb.freebsd.org/changeset/base/244461

Log:
  MFC r243891:
  	Add ability to mergemaster to permit the user to type
  	the absolute path to PAGER if mergemaster can not find
  	the one already set.
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/9/usr.sbin/mergemaster/   (props changed)

Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/9/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 20 00:30:48 2012	(r244460)
+++ stable/9/usr.sbin/mergemaster/mergemaster.sh	Thu Dec 20 00:30:48 2012	(r244461)
@@ -424,6 +424,8 @@ check_pager () {
     echo "  Use 'l' to set PAGER to 'less' for this run"
     echo "  Use 'm' to use plain old 'more' as your PAGER for this run"
     echo ''
+    echo "  or you may type an absolute path to PAGER for this run"
+    echo ''
     echo "  Default is to use plain old 'more' "
     echo ''
     echo -n "What should I do? [Use 'more'] "
@@ -439,6 +441,9 @@ check_pager () {
     [mM]|'')
        PAGER=more
        ;;
+    /*)
+       PAGER="$FIXPAGER"
+       ;;
     *)
        echo ''
        echo "invalid choice: ${FIXPAGER}"