diff options
Diffstat (limited to 'tests.branching/merge-conflict-stratum.stdout')
| -rw-r--r-- | tests.branching/merge-conflict-stratum.stdout | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests.branching/merge-conflict-stratum.stdout b/tests.branching/merge-conflict-stratum.stdout new file mode 100644 index 00000000..a3bb4cc0 --- /dev/null +++ b/tests.branching/merge-conflict-stratum.stdout @@ -0,0 +1,7 @@ +Merge errors encountered merging into test/stable in repo baserock:morphs: +Auto-merging hello-system.morph +CONFLICT (content): Merge conflict in 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. + |