diff options
Diffstat (limited to 'tests.branching/merge-conflict-stratum.stdout')
| -rw-r--r-- | tests.branching/merge-conflict-stratum.stdout | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests.branching/merge-conflict-stratum.stdout b/tests.branching/merge-conflict-stratum.stdout index 20064406..cce0973c 100644 --- a/tests.branching/merge-conflict-stratum.stdout +++ b/tests.branching/merge-conflict-stratum.stdout @@ -1,6 +1,2 @@ -Merge errors encountered in baserock:morphs, branch test/stable: -Auto-merging hello-system.morph -Auto-merging hello-stratum.morph -CONFLICT (content): Merge conflict in hello-stratum.morph -Automatic merge failed; fix conflicts and then commit the result. - +Merge conflicts in baserock:morphs: + hello-stratum.morph |