diff options
Diffstat (limited to 'tests.branching/merge-with-stratum-renamed.stderr')
| -rw-r--r-- | tests.branching/merge-with-stratum-renamed.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge-with-stratum-renamed.stderr b/tests.branching/merge-with-stratum-renamed.stderr index ad144f93..ff408036 100644 --- a/tests.branching/merge-with-stratum-renamed.stderr +++ b/tests.branching/merge-with-stratum-renamed.stderr @@ -1 +1 @@ -ERROR: stratum goodbye-stratum was added within this branch and subsequently edited. This is not yet supported: refusing to merge. +ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/baserock:morphs at ref 804a475402fb6ded64a2749c7adf5b33c7c8ce1e |