diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-03 14:41:43 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-03 14:41:43 +0100 |
| commit | 15e12781bf84663c31aeba846107d80df81e770a (patch) | |
| tree | 4175fc2902a6db3eff76cf30b9c26d8f8601e641 /tests.branching/edit-works-after-branch-root-was-renamed.stdout | |
| parent | d415901bc394c64752b54089427b7b0b5638ca2a (diff) | |
| parent | f9718b4dcc172763c1dd46bc805b6bde03ec3706 (diff) | |
| download | morph-15e12781bf84663c31aeba846107d80df81e770a.tar.gz | |
Merge branch 'jannis/find-repos-using-git-config-option'
Conflicts:
morphlib/plugins/branch_and_merge_plugin.py
Diffstat (limited to 'tests.branching/edit-works-after-branch-root-was-renamed.stdout')
| -rw-r--r-- | tests.branching/edit-works-after-branch-root-was-renamed.stdout | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests.branching/edit-works-after-branch-root-was-renamed.stdout b/tests.branching/edit-works-after-branch-root-was-renamed.stdout new file mode 100644 index 00000000..5cfe475f --- /dev/null +++ b/tests.branching/edit-works-after-branch-root-was-renamed.stdout @@ -0,0 +1,18 @@ +d . +d ./.morph +d ./.morph/cache +d ./.morph/cache/gits +d ./.morph/cache/gits/file_hello +d ./.morph/cache/gits/file_hello/.git +d ./.morph/cache/gits/file_morphs +d ./.morph/cache/gits/file_morphs/.git +d ./master +d ./master/.morph-system-branch +d ./master/baserock:hello +d ./master/baserock:hello/.git +d ./master/my-renamed-morphs +d ./master/my-renamed-morphs/.git +f ./master/.morph-system-branch/config +f ./master/baserock:hello/hello.morph +f ./master/my-renamed-morphs/hello-stratum.morph +f ./master/my-renamed-morphs/hello-system.morph |