diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 13:57:59 +0000 |
| commit | 19b16a2cc6d67871d0a4298354eb446ada136a8e (patch) | |
| tree | 01361b4995f97e26dfa6db56c685bc51a7f8b122 /tests.branching/status-in-dirty-branch.stdout | |
| parent | 6eca890690217136a9685ca9ac55f6ea59882e9c (diff) | |
| parent | eeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff) | |
| download | morph-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz | |
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching/status-in-dirty-branch.stdout')
| -rw-r--r-- | tests.branching/status-in-dirty-branch.stdout | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests.branching/status-in-dirty-branch.stdout b/tests.branching/status-in-dirty-branch.stdout index a81aa765..bee47eaa 100644 --- a/tests.branching/status-in-dirty-branch.stdout +++ b/tests.branching/status-in-dirty-branch.stdout @@ -1,5 +1,5 @@ -On branch test, root baserock:morphs - baserock:morphs: uncommitted changes - baserock:external-strata: uncommitted changes - baserock:stratum2-hello: unexpected ref checked out "master" - TMP/workspace/test/red-herring: not part of system branch +On branch branch1, root test:morphs + test:morphs: uncommitted changes + TMP/workspace/branch1/red-herring: not part of system branch + test:external-strata: uncommitted changes + test:stratum2-hello: unexpected ref checked out "master" |