FreeBSD Bugzilla – Attachment 10050 Details for
Bug 20305
/usr/sbin/mergermaster has incorrect path for `less'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 726 bytes, created by
Dima Sivachenko
on 2000-07-30 20:50:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Dima Sivachenko
Created:
2000-07-30 20:50:01 UTC
Size:
726 bytes
patch
obsolete
>--- mergemaster.orig Sun Jul 30 23:34:19 2000 >+++ mergemaster Sun Jul 30 23:35:03 2000 >@@ -114,8 +114,8 @@ > echo " PAGER and EDITOR. Meanwhile, what would you like to do?" > echo '' > echo " Use 'e' to exit mergemaster and fix your PAGER variable" >- if [ -x /usr/local/bin/less ]; then >- echo " Use 'l' to set PAGER to /usr/local/bin/less for this run" >+ if [ -x /usr/bin/less ]; then >+ echo " Use 'l' to set PAGER to /usr/bin/less for this run" > fi > echo " Use 'm' to use plain old 'more' as your PAGER for this run" > echo '' >@@ -127,7 +127,7 @@ > exit 0 > ;; > [lL]*) >- PAGER=/usr/local/bin/less >+ PAGER=/usr/bin/less > ;; > *) > PAGER=more
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=10050">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 20305
: 10050