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/edit-updates-stratum.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/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 260ac9a6..1e239196 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,24 +1,24 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 006a96c..68fcbff 100644 +index 3b7be17..febfa60 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph @@ -5,7 +5,7 @@ { "name": "hello", - "repo": "baserock:hello", + "repo": "test:hello", - "ref": "master", + "ref": "newbranch", "build-depends": [] } ] diff --git a/hello-system.morph b/hello-system.morph -index 1a33ed6..9cca1bf 100644 +index f3f64b4..99516e3 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,7 +8,7 @@ { "morph": "hello-stratum", - "repo": "baserock:morphs", + "repo": "test:morphs", - "ref": "master" + "ref": "newbranch" } |