|
Lines 68-74
Link Here
|
| 68 |
to its installed counterpart. |
68 |
to its installed counterpart. |
| 69 |
When the script finds a |
69 |
When the script finds a |
| 70 |
change in the new file, or there is no installed |
70 |
change in the new file, or there is no installed |
| 71 |
version of the new file it gives you four options to |
71 |
version of the new file, it gives you four options to |
| 72 |
deal with it. |
72 |
deal with it. |
| 73 |
You can install the new file as is, |
73 |
You can install the new file as is, |
| 74 |
delete the new file, merge the old and new |
74 |
delete the new file, merge the old and new |
|
Lines 84-90
Link Here
|
| 84 |
version $Id/$FreeBSD strings for files that have them, deleting |
84 |
version $Id/$FreeBSD strings for files that have them, deleting |
| 85 |
the temporary file if the strings match. |
85 |
the temporary file if the strings match. |
| 86 |
If there is |
86 |
If there is |
| 87 |
no $Id string, or if the strings are different it |
87 |
no $Id string, or if the strings are different, it |
| 88 |
compares the files themselves. |
88 |
compares the files themselves. |
| 89 |
You can |
89 |
You can |
| 90 |
also specify that the script ignore the $Id strings and |
90 |
also specify that the script ignore the $Id strings and |