diff options
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. |