Fossil SCM
doc fix.
Commit
dd6adf451a3302a577e44f36d99d10be175778ff
Parent
e3f7ba556b9e8ca…
1 file changed
-2
-2
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -89,12 +89,10 @@ | ||
| 89 | 89 | ** |
| 90 | 90 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 91 | 91 | ** files whose names differ only in case are taken |
| 92 | 92 | ** to be the same file. |
| 93 | 93 | ** |
| 94 | -** -v|--verbose Show additional details of the merge | |
| 95 | -** | |
| 96 | 94 | ** -f|--force Force the merge even if it would be a no-op. |
| 97 | 95 | ** |
| 98 | 96 | ** -n|--dry-run If given, display instead of run actions |
| 99 | 97 | ** |
| 100 | 98 | ** -v|--verbose Show additional details of the merge |
| 101 | 99 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -89,12 +89,10 @@ | |
| 89 | ** |
| 90 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 91 | ** files whose names differ only in case are taken |
| 92 | ** to be the same file. |
| 93 | ** |
| 94 | ** -v|--verbose Show additional details of the merge |
| 95 | ** |
| 96 | ** -f|--force Force the merge even if it would be a no-op. |
| 97 | ** |
| 98 | ** -n|--dry-run If given, display instead of run actions |
| 99 | ** |
| 100 | ** -v|--verbose Show additional details of the merge |
| 101 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -89,12 +89,10 @@ | |
| 89 | ** |
| 90 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 91 | ** files whose names differ only in case are taken |
| 92 | ** to be the same file. |
| 93 | ** |
| 94 | ** -f|--force Force the merge even if it would be a no-op. |
| 95 | ** |
| 96 | ** -n|--dry-run If given, display instead of run actions |
| 97 | ** |
| 98 | ** -v|--verbose Show additional details of the merge |
| 99 |