diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2012-12-05 13:56:32 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2012-12-05 13:56:32 +0000 |
| commit | c7b686bbb7fa55049be21b510c4f688f39694bf3 (patch) | |
| tree | 12de0cd4074fa564c3dcb232a1e5f468b82cf9a7 /usr.sbin/mergemaster | |
| parent | dc5e7eb62e48c93a68c7ba4de5aeb482938de766 (diff) | |
| download | src-test2-c7b686bbb7fa55049be21b510c4f688f39694bf3.tar.gz src-test2-c7b686bbb7fa55049be21b510c4f688f39694bf3.zip | |
Add ability to mergemaster to permit the user to type
the absolute path to PAGER if mergemaster can not find
the one already set.
Reviewed by: mjg
Approved by: cperciva
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=243891
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 1723fee24e1a..27d48eec7049 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -426,6 +426,8 @@ check_pager () { fi 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'] " @@ -451,6 +453,9 @@ check_pager () { [mM]|'') PAGER=more ;; + /*) + PAGER="$FIXPAGER" + ;; *) echo '' echo "invalid choice: ${FIXPAGER}" |