diff options
Diffstat (limited to 'tests.branching/merge-conflict-chunks.stderr')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stderr | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests.branching/merge-conflict-chunks.stderr b/tests.branching/merge-conflict-chunks.stderr index 9692d2ec..57aafa5a 100644 --- a/tests.branching/merge-conflict-chunks.stderr +++ b/tests.branching/merge-conflict-chunks.stderr @@ -1,6 +1 @@ -ERROR: merge errors were encountered in the following repositories: - - baserock:stratum2-hello - baserock:stratum3-hello - -Please manually merge the target ref into test/feature in each case in the test/feature system branch, and then repeat the system branch merge. +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. |