Fossil SCM
Fix a couple typos in comments.
Commit
55a28e7f5aec16d4dcc6b4eb73cbbc44fd372f61
Parent
67985cd668bcbaa…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -316,11 +316,11 @@ | ||
| 316 | 316 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 317 | 317 | ** |
| 318 | 318 | ** Options: |
| 319 | 319 | ** --abs-paths Display absolute pathnames. |
| 320 | 320 | ** --dotfiles include files beginning with a dot (".") |
| 321 | -** --ignore <CSG> ignore files matching patterns from the | |
| 321 | +** --ignore <CSG> ignore files matching patterns from the argument | |
| 322 | 322 | ** --rel-paths Display pathnames relative to the current working |
| 323 | 323 | ** directory. |
| 324 | 324 | ** |
| 325 | 325 | ** See also: changes, clean, status |
| 326 | 326 | */ |
| 327 | 327 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -316,11 +316,11 @@ | |
| 316 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 317 | ** |
| 318 | ** Options: |
| 319 | ** --abs-paths Display absolute pathnames. |
| 320 | ** --dotfiles include files beginning with a dot (".") |
| 321 | ** --ignore <CSG> ignore files matching patterns from the |
| 322 | ** --rel-paths Display pathnames relative to the current working |
| 323 | ** directory. |
| 324 | ** |
| 325 | ** See also: changes, clean, status |
| 326 | */ |
| 327 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -316,11 +316,11 @@ | |
| 316 | ** unless overridden by the --abs-paths or --rel-paths options. |
| 317 | ** |
| 318 | ** Options: |
| 319 | ** --abs-paths Display absolute pathnames. |
| 320 | ** --dotfiles include files beginning with a dot (".") |
| 321 | ** --ignore <CSG> ignore files matching patterns from the argument |
| 322 | ** --rel-paths Display pathnames relative to the current working |
| 323 | ** directory. |
| 324 | ** |
| 325 | ** See also: changes, clean, status |
| 326 | */ |
| 327 |
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -87,11 +87,11 @@ | ||
| 87 | 87 | ** option overrides the "binary-glob" setting. |
| 88 | 88 | ** |
| 89 | 89 | ** --nochange | -n Dryrun: do not actually make any changes; just |
| 90 | 90 | ** show what would have happened. |
| 91 | 91 | ** |
| 92 | -** --case-sensitive BOOL Overwrite the case-sensitive setting. If false, | |
| 92 | +** --case-sensitive BOOL Override the case-sensitive setting. If false, | |
| 93 | 93 | ** files whose names differ only in case are taken |
| 94 | 94 | ** to be the same file. |
| 95 | 95 | ** |
| 96 | 96 | ** --force | -f Force the merge even if it would be a no-op. |
| 97 | 97 | */ |
| 98 | 98 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -87,11 +87,11 @@ | |
| 87 | ** option overrides the "binary-glob" setting. |
| 88 | ** |
| 89 | ** --nochange | -n Dryrun: do not actually make any changes; just |
| 90 | ** show what would have happened. |
| 91 | ** |
| 92 | ** --case-sensitive BOOL Overwrite the case-sensitive setting. If false, |
| 93 | ** files whose names differ only in case are taken |
| 94 | ** to be the same file. |
| 95 | ** |
| 96 | ** --force | -f Force the merge even if it would be a no-op. |
| 97 | */ |
| 98 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -87,11 +87,11 @@ | |
| 87 | ** option overrides the "binary-glob" setting. |
| 88 | ** |
| 89 | ** --nochange | -n Dryrun: do not actually make any changes; just |
| 90 | ** show what would have happened. |
| 91 | ** |
| 92 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 93 | ** files whose names differ only in case are taken |
| 94 | ** to be the same file. |
| 95 | ** |
| 96 | ** --force | -f Force the merge even if it would be a no-op. |
| 97 | */ |
| 98 |