summaryrefslogtreecommitdiff
path: root/tests.branching/checkout-existing-branch.stdout
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 15:15:25 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-26 15:15:25 +0100
commitca7900299dc32c7b59e896f5f4b9a38978f226a0 (patch)
treed1f15db7c51c83c1eb1fa11565adc2a295c48eec /tests.branching/checkout-existing-branch.stdout
parent7d7d597afd0a562916f106d259f4ff78383f9631 (diff)
parent9e18d7cc163ab95524349567fc8c4205cd0f11ce (diff)
downloadmorph-ca7900299dc32c7b59e896f5f4b9a38978f226a0.tar.gz
Add rudimentary branch+merge support
Diffstat (limited to 'tests.branching/checkout-existing-branch.stdout')
-rw-r--r--tests.branching/checkout-existing-branch.stdout12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests.branching/checkout-existing-branch.stdout b/tests.branching/checkout-existing-branch.stdout
new file mode 100644
index 00000000..4b29db80
--- /dev/null
+++ b/tests.branching/checkout-existing-branch.stdout
@@ -0,0 +1,12 @@
+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 ./master
+d ./master/morphs
+d ./master/morphs/.git
+Current branches:
+* master