diff options
Diffstat (limited to 'tests.branching/merge-conflict-stratum.stderr')
| -rw-r--r-- | tests.branching/merge-conflict-stratum.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge-conflict-stratum.stderr b/tests.branching/merge-conflict-stratum.stderr index 3a7c1522..57aafa5a 100644 --- a/tests.branching/merge-conflict-stratum.stderr +++ b/tests.branching/merge-conflict-stratum.stderr @@ -1 +1 @@ -ERROR: Merging failed in baserock:morphs: please 'git merge' the latest test/stable into test/feature in the 'test/feature' system branch. +ERROR: merge errors were encountered. Please manually merge the target ref into test/feature in the remote system branch in each case, and then repeat the 'morph merge' operation. |