diff options
Diffstat (limited to 'doc/branching-merging-systems.mdwn')
| -rw-r--r-- | doc/branching-merging-systems.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn index 6fe4d590..3e781b5a 100644 --- a/doc/branching-merging-systems.mdwn +++ b/doc/branching-merging-systems.mdwn @@ -295,8 +295,9 @@ Usage: morph merge BRANCH -This needs to be run inside a system branch directory, and `BRANCH` -must be another system branch checked out in the morph mine. +This needs to be run inside a system branch directory's `morphs` +repository, and `BRANCH` must be another system branch checked out +in the morph mine. * In each git repository modified by the `BRANCH` system branch, run `git merge --no-commit BRANCH`, then undo any changes to |