summaryrefslogtreecommitdiff
path: root/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-30 19:14:47 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-04-30 19:14:47 +0100
commit2d5b60bbbdf1a43d0271f352a0d5f536796002c9 (patch)
tree64e46c965ef66de48764ebe7ef7f1b00f38ad7f4 /tests.branching/branch-creates-new-system-branch-not-from-master.stdout
parentb76d00c7a1e07267b8db214e344e4e9b293e5287 (diff)
downloadmorph-2d5b60bbbdf1a43d0271f352a0d5f536796002c9.tar.gz
Add test for branching off not from master
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout')
-rw-r--r--tests.branching/branch-creates-new-system-branch-not-from-master.stdout29
1 files changed, 29 insertions, 0 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
new file mode 100644
index 00000000..7c04a8dc
--- /dev/null
+++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout
@@ -0,0 +1,29 @@
+File tree:
+d .
+d ./.morph
+d ./.morph/cache
+d ./.morph/cache/gits
+d ./.morph/cache/gits/file_morphs
+d ./.morph/cache/gits/file_morphs/.git
+d ./newbranch
+d ./newbranch/morphs
+d ./newbranch/morphs/.git
+f ./newbranch/morphs/hello-stratum.chunk
+f ./newbranch/morphs/hello-system.chunk
+f ./newbranch/morphs/this.is.alfred
+Current branches:
+ master
+* newbranch
+Current origin:
+* remote origin
+ Fetch URL: file://TMP/morphs
+ Push URL: file://TMP/morphs
+ HEAD branch: master
+ Remote branches:
+ alfred tracked
+ master tracked
+ Local branches configured for 'git pull':
+ master merges with remote master
+ newbranch merges with remote alfred
+ Local ref configured for 'git push':
+ master pushes to master (up to date)