Fossil SCM
Fix minor typos in the diff source code.
Commit
4e169542aee6aa66f449851d3fc1dfa3ddeaddae72f344ed8adde51fd8a9c181
Parent
8e85d6ca2281b8d…
1 file changed
+3
-3
+3
-3
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -1129,11 +1129,11 @@ | ||
| 1129 | 1129 | ** |
| 1130 | 1130 | ** Syntax Mnemonic Description |
| 1131 | 1131 | ** ----------- -------- -------------------------- |
| 1132 | 1132 | ** 0 END This is the end of the diff |
| 1133 | 1133 | ** 1 INTEGER SKIP Skip N lines from both files |
| 1134 | -** 2 STRING COMMON The line show by STRING is in both files | |
| 1134 | +** 2 STRING COMMON The line shown by STRING is in both files | |
| 1135 | 1135 | ** 3 STRING INSERT The line STRING is in only the right file |
| 1136 | 1136 | ** 4 STRING DELETE The STRING line is in only the left file |
| 1137 | 1137 | ** 5 SUBARRAY EDIT One line is different on left and right. |
| 1138 | 1138 | ** |
| 1139 | 1139 | ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples |
| @@ -2959,11 +2959,11 @@ | ||
| 2959 | 2959 | ** |
| 2960 | 2960 | ** 1. The number of lines to copy |
| 2961 | 2961 | ** 2. The number of lines to delete |
| 2962 | 2962 | ** 3. The number of lines to insert |
| 2963 | 2963 | ** |
| 2964 | -** The return vector is terminated bin a triple of all zeros. The caller | |
| 2964 | +** The return vector is terminated by a triple of all zeros. The caller | |
| 2965 | 2965 | ** should free the returned vector using fossil_free(). |
| 2966 | 2966 | ** |
| 2967 | 2967 | ** This diff utility does not work on binary files. If a binary |
| 2968 | 2968 | ** file is encountered, 0 is returned and pOut is written with |
| 2969 | 2969 | ** text "cannot compute difference between binary files". |
| @@ -3198,11 +3198,11 @@ | ||
| 3198 | 3198 | ** |
| 3199 | 3199 | ** Compute an "external diff" between two files. By "external diff" we mean |
| 3200 | 3200 | ** a diff between two disk files that are not necessarily under management. |
| 3201 | 3201 | ** In other words, this command provides a mechanism to use Fossil's file |
| 3202 | 3202 | ** difference engine on arbitrary disk files. See the "diff" command for |
| 3203 | -** computing differences between files that are* under management. | |
| 3203 | +** computing differences between files that are under management. | |
| 3204 | 3204 | ** |
| 3205 | 3205 | ** This command prints the differences between the two files FILE1 and FILE2. |
| 3206 | 3206 | ** all of the usual diff formatting options (--tk, --by, -c N, etc.) apply. |
| 3207 | 3207 | ** See the "diff" command for a full list of command-line options. |
| 3208 | 3208 | ** |
| 3209 | 3209 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1129,11 +1129,11 @@ | |
| 1129 | ** |
| 1130 | ** Syntax Mnemonic Description |
| 1131 | ** ----------- -------- -------------------------- |
| 1132 | ** 0 END This is the end of the diff |
| 1133 | ** 1 INTEGER SKIP Skip N lines from both files |
| 1134 | ** 2 STRING COMMON The line show by STRING is in both files |
| 1135 | ** 3 STRING INSERT The line STRING is in only the right file |
| 1136 | ** 4 STRING DELETE The STRING line is in only the left file |
| 1137 | ** 5 SUBARRAY EDIT One line is different on left and right. |
| 1138 | ** |
| 1139 | ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples |
| @@ -2959,11 +2959,11 @@ | |
| 2959 | ** |
| 2960 | ** 1. The number of lines to copy |
| 2961 | ** 2. The number of lines to delete |
| 2962 | ** 3. The number of lines to insert |
| 2963 | ** |
| 2964 | ** The return vector is terminated bin a triple of all zeros. The caller |
| 2965 | ** should free the returned vector using fossil_free(). |
| 2966 | ** |
| 2967 | ** This diff utility does not work on binary files. If a binary |
| 2968 | ** file is encountered, 0 is returned and pOut is written with |
| 2969 | ** text "cannot compute difference between binary files". |
| @@ -3198,11 +3198,11 @@ | |
| 3198 | ** |
| 3199 | ** Compute an "external diff" between two files. By "external diff" we mean |
| 3200 | ** a diff between two disk files that are not necessarily under management. |
| 3201 | ** In other words, this command provides a mechanism to use Fossil's file |
| 3202 | ** difference engine on arbitrary disk files. See the "diff" command for |
| 3203 | ** computing differences between files that are* under management. |
| 3204 | ** |
| 3205 | ** This command prints the differences between the two files FILE1 and FILE2. |
| 3206 | ** all of the usual diff formatting options (--tk, --by, -c N, etc.) apply. |
| 3207 | ** See the "diff" command for a full list of command-line options. |
| 3208 | ** |
| 3209 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1129,11 +1129,11 @@ | |
| 1129 | ** |
| 1130 | ** Syntax Mnemonic Description |
| 1131 | ** ----------- -------- -------------------------- |
| 1132 | ** 0 END This is the end of the diff |
| 1133 | ** 1 INTEGER SKIP Skip N lines from both files |
| 1134 | ** 2 STRING COMMON The line shown by STRING is in both files |
| 1135 | ** 3 STRING INSERT The line STRING is in only the right file |
| 1136 | ** 4 STRING DELETE The STRING line is in only the left file |
| 1137 | ** 5 SUBARRAY EDIT One line is different on left and right. |
| 1138 | ** |
| 1139 | ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples |
| @@ -2959,11 +2959,11 @@ | |
| 2959 | ** |
| 2960 | ** 1. The number of lines to copy |
| 2961 | ** 2. The number of lines to delete |
| 2962 | ** 3. The number of lines to insert |
| 2963 | ** |
| 2964 | ** The return vector is terminated by a triple of all zeros. The caller |
| 2965 | ** should free the returned vector using fossil_free(). |
| 2966 | ** |
| 2967 | ** This diff utility does not work on binary files. If a binary |
| 2968 | ** file is encountered, 0 is returned and pOut is written with |
| 2969 | ** text "cannot compute difference between binary files". |
| @@ -3198,11 +3198,11 @@ | |
| 3198 | ** |
| 3199 | ** Compute an "external diff" between two files. By "external diff" we mean |
| 3200 | ** a diff between two disk files that are not necessarily under management. |
| 3201 | ** In other words, this command provides a mechanism to use Fossil's file |
| 3202 | ** difference engine on arbitrary disk files. See the "diff" command for |
| 3203 | ** computing differences between files that are under management. |
| 3204 | ** |
| 3205 | ** This command prints the differences between the two files FILE1 and FILE2. |
| 3206 | ** all of the usual diff formatting options (--tk, --by, -c N, etc.) apply. |
| 3207 | ** See the "diff" command for a full list of command-line options. |
| 3208 | ** |
| 3209 |