Date: Thu, 20 Dec 2012 00:30:48 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r244462 - stable/7/usr.sbin/mergemaster Message-ID: <201212200030.qBK0UmQY021764@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Thu Dec 20 00:30:48 2012 New Revision: 244462 URL: http://svnweb.freebsd.org/changeset/base/244462 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/7/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/7/usr.sbin/mergemaster/ (props changed) Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.sh Thu Dec 20 00:30:48 2012 (r244461) +++ stable/7/usr.sbin/mergemaster/mergemaster.sh Thu Dec 20 00:30:48 2012 (r244462) @@ -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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212200030.qBK0UmQY021764>