Fossil SCM
Added clarification note for merge command.
Commit
a35cfda912e476ba1cd24f5dc22fde240ff408bedfe3caca9be37cc5e168e686
Parent
c1aefb00c351f7b…
1 file changed
+3
+3
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -295,10 +295,13 @@ | ||
| 295 | 295 | ** Files which are renamed in the merged-in branch will be renamed in |
| 296 | 296 | ** the current check-out. |
| 297 | 297 | ** |
| 298 | 298 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 299 | 299 | ** a recent fork on the current branch to merge. |
| 300 | +** | |
| 301 | +** Note that this command does not commit the merge, as that is a | |
| 302 | +** separate step. | |
| 300 | 303 | ** |
| 301 | 304 | ** If there are multiple VERSION arguments, then each VERSION is merged |
| 302 | 305 | ** (or cherrypicked) in the order that they appear on the command-line. |
| 303 | 306 | ** |
| 304 | 307 | ** Options: |
| 305 | 308 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -295,10 +295,13 @@ | |
| 295 | ** Files which are renamed in the merged-in branch will be renamed in |
| 296 | ** the current check-out. |
| 297 | ** |
| 298 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 299 | ** a recent fork on the current branch to merge. |
| 300 | ** |
| 301 | ** If there are multiple VERSION arguments, then each VERSION is merged |
| 302 | ** (or cherrypicked) in the order that they appear on the command-line. |
| 303 | ** |
| 304 | ** Options: |
| 305 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -295,10 +295,13 @@ | |
| 295 | ** Files which are renamed in the merged-in branch will be renamed in |
| 296 | ** the current check-out. |
| 297 | ** |
| 298 | ** If the VERSION argument is omitted, then Fossil attempts to find |
| 299 | ** a recent fork on the current branch to merge. |
| 300 | ** |
| 301 | ** Note that this command does not commit the merge, as that is a |
| 302 | ** separate step. |
| 303 | ** |
| 304 | ** If there are multiple VERSION arguments, then each VERSION is merged |
| 305 | ** (or cherrypicked) in the order that they appear on the command-line. |
| 306 | ** |
| 307 | ** Options: |
| 308 |