diff options
Diffstat (limited to 'tests.branching/merge-conflict-chunks.stderr')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stderr | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests.branching/merge-conflict-chunks.stderr b/tests.branching/merge-conflict-chunks.stderr new file mode 100644 index 00000000..0bdc9475 --- /dev/null +++ b/tests.branching/merge-conflict-chunks.stderr @@ -0,0 +1,6 @@ +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. |