diff options
Diffstat (limited to 'tests.branching/merge-conflict-chunks.stderr')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge-conflict-chunks.stderr b/tests.branching/merge-conflict-chunks.stderr index 0bdc9475..9692d2ec 100644 --- a/tests.branching/merge-conflict-chunks.stderr +++ b/tests.branching/merge-conflict-chunks.stderr @@ -3,4 +3,4 @@ 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, and then merge the system branch. +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. |