|
Lines 114-121
Link Here
|
| 114 |
echo " PAGER and EDITOR. Meanwhile, what would you like to do?" |
114 |
echo " PAGER and EDITOR. Meanwhile, what would you like to do?" |
| 115 |
echo '' |
115 |
echo '' |
| 116 |
echo " Use 'e' to exit mergemaster and fix your PAGER variable" |
116 |
echo " Use 'e' to exit mergemaster and fix your PAGER variable" |
| 117 |
if [ -x /usr/local/bin/less ]; then |
117 |
if [ -x /usr/bin/less ]; then |
| 118 |
echo " Use 'l' to set PAGER to /usr/local/bin/less for this run" |
118 |
echo " Use 'l' to set PAGER to /usr/bin/less for this run" |
| 119 |
fi |
119 |
fi |
| 120 |
echo " Use 'm' to use plain old 'more' as your PAGER for this run" |
120 |
echo " Use 'm' to use plain old 'more' as your PAGER for this run" |
| 121 |
echo '' |
121 |
echo '' |
|
Lines 127-133
Link Here
|
| 127 |
exit 0 |
127 |
exit 0 |
| 128 |
;; |
128 |
;; |
| 129 |
[lL]*) |
129 |
[lL]*) |
| 130 |
PAGER=/usr/local/bin/less |
130 |
PAGER=/usr/bin/less |
| 131 |
;; |
131 |
;; |
| 132 |
*) |
132 |
*) |
| 133 |
PAGER=more |
133 |
PAGER=more |