summaryrefslogtreecommitdiff
path: root/tests.branching/minedir.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/minedir.stdout
parent7d7d597afd0a562916f106d259f4ff78383f9631 (diff)
parent9e18d7cc163ab95524349567fc8c4205cd0f11ce (diff)
downloadmorph-ca7900299dc32c7b59e896f5f4b9a38978f226a0.tar.gz
Add rudimentary branch+merge support
Diffstat (limited to 'tests.branching/minedir.stdout')
-rw-r--r--tests.branching/minedir.stdout1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/minedir.stdout b/tests.branching/minedir.stdout
new file mode 100644
index 00000000..0fc25ee9
--- /dev/null
+++ b/tests.branching/minedir.stdout
@@ -0,0 +1 @@
+TMP/mine