path: root/tests.branching/merge-conflict-stratum.stdout

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.