Fossil SCM
Clarification of text in the quickstart.wiki documentation.
Commit
99bbb260724aa0dfac6a078d75549a34b217b033
Parent
83fd73849043380…
1 file changed
+1
-1
+1
-1
| --- www/quickstart.wiki | ||
| +++ www/quickstart.wiki | ||
| @@ -268,11 +268,11 @@ | ||
| 268 | 268 | before you start editing, if you want, but most people just wait |
| 269 | 269 | until they are ready to commit. |
| 270 | 270 | |
| 271 | 271 | To merge two branches back together, first |
| 272 | 272 | [/help/update | update] to the branch you want to merge into. |
| 273 | - Then do a [/help/merge|merge] another branch that you want to incorporate | |
| 273 | + Then do a [/help/merge|merge] of the other branch that you want to incorporate | |
| 274 | 274 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 275 | 275 | do this:</p> |
| 276 | 276 | |
| 277 | 277 | <blockquote> |
| 278 | 278 | <b>fossil [/help/update|update] trunk</b><br> |
| 279 | 279 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -268,11 +268,11 @@ | |
| 268 | before you start editing, if you want, but most people just wait |
| 269 | until they are ready to commit. |
| 270 | |
| 271 | To merge two branches back together, first |
| 272 | [/help/update | update] to the branch you want to merge into. |
| 273 | Then do a [/help/merge|merge] another branch that you want to incorporate |
| 274 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 275 | do this:</p> |
| 276 | |
| 277 | <blockquote> |
| 278 | <b>fossil [/help/update|update] trunk</b><br> |
| 279 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -268,11 +268,11 @@ | |
| 268 | before you start editing, if you want, but most people just wait |
| 269 | until they are ready to commit. |
| 270 | |
| 271 | To merge two branches back together, first |
| 272 | [/help/update | update] to the branch you want to merge into. |
| 273 | Then do a [/help/merge|merge] of the other branch that you want to incorporate |
| 274 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 275 | do this:</p> |
| 276 | |
| 277 | <blockquote> |
| 278 | <b>fossil [/help/update|update] trunk</b><br> |
| 279 |