diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-25 15:55:16 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-25 19:03:37 +0100 |
| commit | 11863d70955c86664466c03c1d194e6f56645050 (patch) | |
| tree | 97581ab135fc9355c7295d3d5977eb6492fe6619 /tests.branching/merge-conflict-chunks.stdout | |
| parent | 6a85de8f3b427431d76db41e4e6925467fe1d868 (diff) | |
| download | morph-11863d70955c86664466c03c1d194e6f56645050.tar.gz | |
Add merge conflict tests
Diffstat (limited to 'tests.branching/merge-conflict-chunks.stdout')
| -rw-r--r-- | tests.branching/merge-conflict-chunks.stdout | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests.branching/merge-conflict-chunks.stdout b/tests.branching/merge-conflict-chunks.stdout new file mode 100644 index 00000000..cfb9949d --- /dev/null +++ b/tests.branching/merge-conflict-chunks.stdout @@ -0,0 +1,10 @@ +Merge errors encountered merging into test/stable in repo baserock:stratum2-hello: +Auto-merging conflict.txt +CONFLICT (add/add): Merge conflict in conflict.txt +Automatic merge failed; fix conflicts and then commit the result. + +Merge errors encountered merging into test/stable in repo baserock:stratum3-hello: +Auto-merging conflict.txt +CONFLICT (add/add): Merge conflict in conflict.txt +Automatic merge failed; fix conflicts and then commit the result. + |