summaryrefslogtreecommitdiff
path: root/tests.merging/basic.stdout
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 15:51:01 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-11-07 18:53:48 +0000
commitb599757873d5f05e82647287dfd1387f2426e5c5 (patch)
tree45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.merging/basic.stdout
parent25067e0ff261577da0ace26126c01e2829d7e5b7 (diff)
downloadmorph-b599757873d5f05e82647287dfd1387f2426e5c5.tar.gz
tests: Use test: URL prefix instead of baserock: throughout
Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
Diffstat (limited to 'tests.merging/basic.stdout')
-rw-r--r--tests.merging/basic.stdout4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/basic.stdout b/tests.merging/basic.stdout
index 2bdde644..7acb135c 100644
--- a/tests.merging/basic.stdout
+++ b/tests.merging/basic.stdout
@@ -1,5 +1,5 @@
-Commit message for baserock:morphs
+Commit message for test:morphs
initial
-Commit message for baserock:hello
+Commit message for test:hello
Merge system branch 'test/feature'