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, 1 insertions, 1 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout index cce0973c..f55822a9 100644 --- a/tests.merging/conflict-stratum-field-ordering.stdout +++ b/tests.merging/conflict-stratum-field-ordering.stdout @@ -1,2 +1,2 @@ -Merge conflicts in baserock:morphs: +Merge conflicts in test:morphs: hello-stratum.morph |