Minor typos.
This commit is contained in:
parent
d7b35e07f8
commit
3c38e443b3
|
@ -999,7 +999,7 @@ greatly simplify working on dependent branches because they
|
|||
automatically take care of the stacking dependencies for you.
|
||||
Imagine looms as a stack of dependent branches (called "threads" in
|
||||
loom parlance), with easy ways to move up and down the stack of
|
||||
thread, merge changes up the stack to descendant threads, create
|
||||
threads, merge changes up the stack to descendant threads, create
|
||||
diffs between threads, etc. Occasionally, you may need or want to
|
||||
export your loom threads into separate branches, either for review
|
||||
or commit. Higher threads incorporate all the changes in the lower
|
||||
|
@ -1032,7 +1032,7 @@ now-redundant fix-socket thread.
|
|||
|
||||
bzr down-thread trunk
|
||||
# Get all new revisions to the trunk. If you've done things
|
||||
# correctly, this must succeed without conflict.
|
||||
# correctly, this will succeed without conflict.
|
||||
bzr pull
|
||||
bzr up-thread
|
||||
# See? The fix-socket thread is now identical to the trunk
|
||||
|
|
Loading…
Reference in New Issue