Fossil SCM
Removed the docs for the merge command's --case-sensitive flag, as it does not seem to be applied anywhere.
Commit
e340af58a249dc09cfb78490ebca382a4d6e3368a6d0f351aebb6cdc60f446c0
Parent
48a860f658cbf7f…
1 file changed
-4
-4
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -307,14 +307,10 @@ | ||
| 307 | 307 | ** |
| 308 | 308 | ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary |
| 309 | 309 | ** and do not try to merge parallel changes. This |
| 310 | 310 | ** option overrides the "binary-glob" setting. |
| 311 | 311 | ** |
| 312 | -** --case-sensitive BOOL Override the case-sensitive setting. If false, | |
| 313 | -** files whose names differ only in case are taken | |
| 314 | -** to be the same file. | |
| 315 | -** | |
| 316 | 312 | ** --cherrypick Do a cherrypick merge VERSION into the current |
| 317 | 313 | ** checkout. A cherrypick merge pulls in the changes |
| 318 | 314 | ** of the single check-in VERSION, rather than all |
| 319 | 315 | ** changes back to the nearest common ancestor. |
| 320 | 316 | ** |
| 321 | 317 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -307,14 +307,10 @@ | |
| 307 | ** |
| 308 | ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary |
| 309 | ** and do not try to merge parallel changes. This |
| 310 | ** option overrides the "binary-glob" setting. |
| 311 | ** |
| 312 | ** --case-sensitive BOOL Override the case-sensitive setting. If false, |
| 313 | ** files whose names differ only in case are taken |
| 314 | ** to be the same file. |
| 315 | ** |
| 316 | ** --cherrypick Do a cherrypick merge VERSION into the current |
| 317 | ** checkout. A cherrypick merge pulls in the changes |
| 318 | ** of the single check-in VERSION, rather than all |
| 319 | ** changes back to the nearest common ancestor. |
| 320 | ** |
| 321 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -307,14 +307,10 @@ | |
| 307 | ** |
| 308 | ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary |
| 309 | ** and do not try to merge parallel changes. This |
| 310 | ** option overrides the "binary-glob" setting. |
| 311 | ** |
| 312 | ** --cherrypick Do a cherrypick merge VERSION into the current |
| 313 | ** checkout. A cherrypick merge pulls in the changes |
| 314 | ** of the single check-in VERSION, rather than all |
| 315 | ** changes back to the nearest common ancestor. |
| 316 | ** |
| 317 |