summaryrefslogtreecommitdiff
path: root/tests.branching/checkout-works-anywhere.stdout
diff options
context:
space:
mode:
Diffstat (limited to 'tests.branching/checkout-works-anywhere.stdout')
-rw-r--r--tests.branching/checkout-works-anywhere.stdout6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/checkout-works-anywhere.stdout b/tests.branching/checkout-works-anywhere.stdout
index 0cd18b85..bb4cc1fa 100644
--- a/tests.branching/checkout-works-anywhere.stdout
+++ b/tests.branching/checkout-works-anywhere.stdout
@@ -9,7 +9,7 @@ d ./master
d ./master/.morph-system-branch
d ./master/baserock:morphs
d ./master/baserock:morphs/.git
-f ./master/.morph-system-branch/branch-root
+f ./master/.morph-system-branch/config
f ./master/baserock:morphs/hello-stratum.morph
f ./master/baserock:morphs/hello-system.morph
Workspace after checking out master from within a new branch:
@@ -27,9 +27,9 @@ d ./newbranch
d ./newbranch/.morph-system-branch
d ./newbranch/baserock:morphs
d ./newbranch/baserock:morphs/.git
-f ./master/.morph-system-branch/branch-root
+f ./master/.morph-system-branch/config
f ./master/baserock:morphs/hello-stratum.morph
f ./master/baserock:morphs/hello-system.morph
-f ./newbranch/.morph-system-branch/branch-root
+f ./newbranch/.morph-system-branch/config
f ./newbranch/baserock:morphs/hello-stratum.morph
f ./newbranch/baserock:morphs/hello-system.morph