FreeBSD Bugzilla – Attachment 21815 Details for
Bug 38097
Punctuation in mergemaster.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 765 bytes, created by
Chris Pepper
on 2002-05-15 05:10:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Chris Pepper
Created:
2002-05-15 05:10:01 UTC
Size:
765 bytes
patch
obsolete
>--- mergemaster.8 Tue May 14 22:41:47 2002 >+++ mergemaster.8.fixed Tue May 14 23:56:57 2002 >@@ -68,7 +68,7 @@ > to its installed counterpart. > When the script finds a > change in the new file, or there is no installed >-version of the new file it gives you four options to >+version of the new file, it gives you four options to > deal with it. > You can install the new file as is, > delete the new file, merge the old and new >@@ -84,7 +84,7 @@ > version $Id/$FreeBSD strings for files that have them, deleting > the temporary file if the strings match. > If there is >-no $Id string, or if the strings are different it >+no $Id string, or if the strings are different, it > compares the files themselves. > You can > also specify that the script ignore the $Id strings and
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=21815">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 38097
: 21815