Fossil SCM
merge command help text cleanups, based on forum feedback.
Commit
edd08ef4f8b5e4c6230075ba6763e87eb09029ce6779769dc077fe1ffad30a91
Parent
401711d484b67e0…
1 file changed
+7
-8
+7
-8
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -280,24 +280,23 @@ | ||
| 280 | 280 | ** |
| 281 | 281 | ** Usage: %fossil merge ?OPTIONS? ?VERSION? |
| 282 | 282 | ** |
| 283 | 283 | ** The argument VERSION is a version that should be merged into the |
| 284 | 284 | ** current check-out. All changes from VERSION back to the nearest |
| 285 | -** common ancestor are merged. Except, if either of the --cherrypick or | |
| 286 | -** --backout options are used only the changes associated with the | |
| 285 | +** common ancestor are merged. Except, if either of the --cherrypick | |
| 286 | +** or --backout options are used only the changes associated with the | |
| 287 | 287 | ** single check-in VERSION are merged. The --backout option causes |
| 288 | 288 | ** the changes associated with VERSION to be removed from the current |
| 289 | -** check-out rather than added. When invoked with the name cherry-pick, | |
| 290 | -** this command works exactly like merge --cherrypick. | |
| 289 | +** check-out rather than added. When invoked with the name | |
| 290 | +** cherry-pick, this command works exactly like merge --cherrypick. | |
| 291 | +** | |
| 292 | +** Files which are renamed in the merged-in branch will be renamed in | |
| 293 | +** the current check-out. | |
| 291 | 294 | ** |
| 292 | 295 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 293 | 296 | ** a recent fork on the current branch to merge. |
| 294 | 297 | ** |
| 295 | -** Only file content is merged. The result continues to use the | |
| 296 | -** file and directory names from the current check-out even if those | |
| 297 | -** names might have been changed in the branch being merged in. | |
| 298 | -** | |
| 299 | 298 | ** Options: |
| 300 | 299 | ** --backout Do a reverse cherrypick merge against VERSION. |
| 301 | 300 | ** In other words, back out the changes that were |
| 302 | 301 | ** added by VERSION. |
| 303 | 302 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 304 | 303 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -280,24 +280,23 @@ | |
| 280 | ** |
| 281 | ** Usage: %fossil merge ?OPTIONS? ?VERSION? |
| 282 | ** |
| 283 | ** The argument VERSION is a version that should be merged into the |
| 284 | ** current check-out. All changes from VERSION back to the nearest |
| 285 | ** common ancestor are merged. Except, if either of the --cherrypick or |
| 286 | ** --backout options are used only the changes associated with the |
| 287 | ** single check-in VERSION are merged. The --backout option causes |
| 288 | ** the changes associated with VERSION to be removed from the current |
| 289 | ** check-out rather than added. When invoked with the name cherry-pick, |
| 290 | ** this command works exactly like merge --cherrypick. |
| 291 | ** |
| 292 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 293 | ** a recent fork on the current branch to merge. |
| 294 | ** |
| 295 | ** Only file content is merged. The result continues to use the |
| 296 | ** file and directory names from the current check-out even if those |
| 297 | ** names might have been changed in the branch being merged in. |
| 298 | ** |
| 299 | ** Options: |
| 300 | ** --backout Do a reverse cherrypick merge against VERSION. |
| 301 | ** In other words, back out the changes that were |
| 302 | ** added by VERSION. |
| 303 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 304 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -280,24 +280,23 @@ | |
| 280 | ** |
| 281 | ** Usage: %fossil merge ?OPTIONS? ?VERSION? |
| 282 | ** |
| 283 | ** The argument VERSION is a version that should be merged into the |
| 284 | ** current check-out. All changes from VERSION back to the nearest |
| 285 | ** common ancestor are merged. Except, if either of the --cherrypick |
| 286 | ** or --backout options are used only the changes associated with the |
| 287 | ** single check-in VERSION are merged. The --backout option causes |
| 288 | ** the changes associated with VERSION to be removed from the current |
| 289 | ** check-out rather than added. When invoked with the name |
| 290 | ** cherry-pick, this command works exactly like merge --cherrypick. |
| 291 | ** |
| 292 | ** Files which are renamed in the merged-in branch will be renamed in |
| 293 | ** the current check-out. |
| 294 | ** |
| 295 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 296 | ** a recent fork on the current branch to merge. |
| 297 | ** |
| 298 | ** Options: |
| 299 | ** --backout Do a reverse cherrypick merge against VERSION. |
| 300 | ** In other words, back out the changes that were |
| 301 | ** added by VERSION. |
| 302 | ** --baseline BASELINE Use BASELINE as the "pivot" of the merge instead |
| 303 |