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-stratum.stderr | |
| parent | 6a85de8f3b427431d76db41e4e6925467fe1d868 (diff) | |
| download | morph-11863d70955c86664466c03c1d194e6f56645050.tar.gz | |
Add merge conflict tests
Diffstat (limited to 'tests.branching/merge-conflict-stratum.stderr')
| -rw-r--r-- | tests.branching/merge-conflict-stratum.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/merge-conflict-stratum.stderr b/tests.branching/merge-conflict-stratum.stderr new file mode 100644 index 00000000..36781ad7 --- /dev/null +++ b/tests.branching/merge-conflict-stratum.stderr @@ -0,0 +1 @@ +ERROR: Merging failed in baserock:morphs: please manually merge test/stable into test/feature in this repo and try again. |