diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-02-14 10:22:46 +0000 |
| commit | 8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch) | |
| tree | d0d19252c154fb030f7dfa1c4784ef60e45bc40e /tests.branching/edit-updates-stratum.stdout | |
| parent | 2decdcdd27567e99e3bc53347d34064ab34f7932 (diff) | |
| parent | fbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff) | |
| download | morph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz | |
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'tests.branching/edit-updates-stratum.stdout')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 7120ef50..ae1af132 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -12,15 +12,3 @@ index 73ed482..475fe0f 100644 + unpetrify-ref: master kind: stratum name: hello-stratum -diff --git a/hello-system.morph b/hello-system.morph -index 3f7b4d3..199c924 100644 ---- a/hello-system.morph -+++ b/hello-system.morph -@@ -3,5 +3,6 @@ kind: system - name: hello-system - strata: - - morph: hello-stratum -- ref: master -+ ref: newbranch - repo: test:morphs -+ unpetrify-ref: master |