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
This commit is contained in:
parent
dc5e7eb62e
commit
c7b686bbb7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=243891
@ -426,6 +426,8 @@ check_pager () {
|
|||||||
fi
|
fi
|
||||||
echo " Use 'm' to use plain old 'more' as your PAGER for this run"
|
echo " Use 'm' to use plain old 'more' as your PAGER for this run"
|
||||||
echo ''
|
echo ''
|
||||||
|
echo " or you may type an absolute path to PAGER for this run"
|
||||||
|
echo ''
|
||||||
echo " Default is to use plain old 'more' "
|
echo " Default is to use plain old 'more' "
|
||||||
echo ''
|
echo ''
|
||||||
echo -n "What should I do? [Use 'more'] "
|
echo -n "What should I do? [Use 'more'] "
|
||||||
@ -451,6 +453,9 @@ check_pager () {
|
|||||||
[mM]|'')
|
[mM]|'')
|
||||||
PAGER=more
|
PAGER=more
|
||||||
;;
|
;;
|
||||||
|
/*)
|
||||||
|
PAGER="$FIXPAGER"
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo ''
|
echo ''
|
||||||
echo "invalid choice: ${FIXPAGER}"
|
echo "invalid choice: ${FIXPAGER}"
|
||||||
|
Loading…
Reference in New Issue
Block a user