diff options
Diffstat (limited to 'tests.merging/conflict-morphology-kind.stderr')
| -rw-r--r-- | tests.merging/conflict-morphology-kind.stderr | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.merging/conflict-morphology-kind.stderr b/tests.merging/conflict-morphology-kind.stderr new file mode 100644 index 00000000..ff6539a7 --- /dev/null +++ b/tests.merging/conflict-morphology-kind.stderr @@ -0,0 +1 @@ +ERROR: merge conflict: "kind" of morphology hello-system.hello-stratum changed from stratum to chunk |