diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 15:51:01 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-07 18:53:48 +0000 |
commit | b599757873d5f05e82647287dfd1387f2426e5c5 (patch) | |
tree | 45813def262ff7d58b0e3c9564670fd0907d9ff7 /tests.merging/conflict-chunks.stdout | |
parent | 25067e0ff261577da0ace26126c01e2829d7e5b7 (diff) | |
download | morph-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/conflict-chunks.stdout')
-rw-r--r-- | tests.merging/conflict-chunks.stdout | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/conflict-chunks.stdout b/tests.merging/conflict-chunks.stdout index bf6d3828..01ae550f 100644 --- a/tests.merging/conflict-chunks.stdout +++ b/tests.merging/conflict-chunks.stdout @@ -1,4 +1,4 @@ -Merge conflicts in baserock:stratum2-hello: +Merge conflicts in test:stratum2-hello: conflict.txt -Merge conflicts in baserock:stratum3-hello: +Merge conflicts in test:stratum3-hello: conflict.txt |