summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch.stdout
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-31 14:59:35 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-08-31 15:06:56 +0000
commit6935a3db514f1552c2ffd4d24b6521bb185dcd73 (patch)
tree61131d3f43a1856e7b84b61a7520265d30539747 /tests.branching/branch-creates-new-system-branch.stdout
parentdfd41a201e9d7efd3e98653e94c11434302fe7a4 (diff)
downloadmorph-6935a3db514f1552c2ffd4d24b6521bb185dcd73.tar.gz
Use git config to store the branch root in .morph-system-branch/config
This way we can store more branch config options in the future more conveniently without having store them all in separate files or writing our own code to parse the options into a branch config object or something like that.
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch.stdout')
-rw-r--r--tests.branching/branch-creates-new-system-branch.stdout2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/branch-creates-new-system-branch.stdout b/tests.branching/branch-creates-new-system-branch.stdout
index 3f2dba1d..e79e8588 100644
--- a/tests.branching/branch-creates-new-system-branch.stdout
+++ b/tests.branching/branch-creates-new-system-branch.stdout
@@ -9,7 +9,7 @@ d ./newbranch
d ./newbranch/.morph-system-branch
d ./newbranch/baserock:morphs
d ./newbranch/baserock:morphs/.git
-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
Current branches: