FreeBSD Bugzilla – Attachment 16715 Details for
Bug 30544
[PATCH] remove irritating pauses from mergemaster
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 806 bytes, created by
Tony Finch
on 2001-09-13 01:20:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Tony Finch
Created:
2001-09-13 01:20:00 UTC
Size:
806 bytes
patch
obsolete
>Index: usr.sbin/mergemaster//mergemaster.sh >=================================================================== >RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v >retrieving revision 1.6.2.9 >diff -u -r1.6.2.9 mergemaster.sh >--- usr.sbin/mergemaster//mergemaster.sh 2001/08/11 20:27:52 1.6.2.9 >+++ usr.sbin/mergemaster//mergemaster.sh 2001/09/13 01:08:52 >@@ -200,12 +200,6 @@ > done > unset NO_INSTALLED > echo '' >- case "${VERBOSE}" in >- '') ;; >- *) >- sleep 3 >- ;; >- esac > } > > # Set the default path for the temporary root environment >@@ -338,7 +332,6 @@ > if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then > echo " *** You have ${PAGER} defined as your pager so we will use that" > echo '' >- sleep 3 > fi > > # Assign the diff flag once so we will not have to keep testing it
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=16715">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 30544
: 16715