Fossil SCM
(Grammar) Remove duplicate word in comment.
Commit
6ebc9e0e238a985e0c654421eac1460de78072bbb3db41ad64588271672e8d7e
Parent
6ff817d3c7bd46e…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -240,11 +240,11 @@ | ||
| 240 | 240 | ** Usage: %fossil merge-info [OPTIONS] |
| 241 | 241 | ** |
| 242 | 242 | ** Display information about the most recent merge operation. |
| 243 | 243 | ** |
| 244 | 244 | ** Options: |
| 245 | -** -a|--all Show all all file changes that happened because of | |
| 245 | +** -a|--all Show all file changes that happened because of | |
| 246 | 246 | ** the merge. Normally only MERGE, CONFLICT, and ERROR |
| 247 | 247 | ** lines are shown |
| 248 | 248 | ** -c|--context N Show N lines of context around each change, |
| 249 | 249 | ** with negative N meaning show all content. Only |
| 250 | 250 | ** meaningful in combination with --tcl or --tk. |
| 251 | 251 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -240,11 +240,11 @@ | |
| 240 | ** Usage: %fossil merge-info [OPTIONS] |
| 241 | ** |
| 242 | ** Display information about the most recent merge operation. |
| 243 | ** |
| 244 | ** Options: |
| 245 | ** -a|--all Show all all file changes that happened because of |
| 246 | ** the merge. Normally only MERGE, CONFLICT, and ERROR |
| 247 | ** lines are shown |
| 248 | ** -c|--context N Show N lines of context around each change, |
| 249 | ** with negative N meaning show all content. Only |
| 250 | ** meaningful in combination with --tcl or --tk. |
| 251 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -240,11 +240,11 @@ | |
| 240 | ** Usage: %fossil merge-info [OPTIONS] |
| 241 | ** |
| 242 | ** Display information about the most recent merge operation. |
| 243 | ** |
| 244 | ** Options: |
| 245 | ** -a|--all Show all file changes that happened because of |
| 246 | ** the merge. Normally only MERGE, CONFLICT, and ERROR |
| 247 | ** lines are shown |
| 248 | ** -c|--context N Show N lines of context around each change, |
| 249 | ** with negative N meaning show all content. Only |
| 250 | ** meaningful in combination with --tcl or --tk. |
| 251 |