summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-10-18 12:24:27 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-10-18 12:24:27 +0100
commit2bcc7ba44734c73a4a80b40b80a42b1376af5e00 (patch)
tree24c47a885bdbf907b8f2b66e03dbf6f58050f579 /tests.branching
parent1ff0d7088d6d800f26392850861d71bb2f14932c (diff)
parente1ee5840b7e3bb034894fb3a3450dbeaa655b73f (diff)
downloadmorph-2bcc7ba44734c73a4a80b40b80a42b1376af5e00.tar.gz
Merge branch 'samthursfield/morph-status-in-workspace-sorted'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'tests.branching')
-rw-r--r--tests.branching/status-in-workspace.stdout2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/status-in-workspace.stdout b/tests.branching/status-in-workspace.stdout
index 8d34a8a6..15958736 100644
--- a/tests.branching/status-in-workspace.stdout
+++ b/tests.branching/status-in-workspace.stdout
@@ -1,4 +1,4 @@
System branches in current workspace:
- master
a/b/c/d/e/bar
a/b/c/d/e/foo
+ master