diff options
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.stdout')
| -rw-r--r-- | tests.merging/conflict-stratum-field-ordering.stdout | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout new file mode 100644 index 00000000..cce0973c --- /dev/null +++ b/tests.merging/conflict-stratum-field-ordering.stdout @@ -0,0 +1,2 @@ +Merge conflicts in baserock:morphs: + hello-stratum.morph |