diff options
Diffstat (limited to 'tests.branching/merge-handles-unmergable-cases.stderr')
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.branching/merge-handles-unmergable-cases.stderr b/tests.branching/merge-handles-unmergable-cases.stderr index 513db2b8..64c9c34b 100644 --- a/tests.branching/merge-handles-unmergable-cases.stderr +++ b/tests.branching/merge-handles-unmergable-cases.stderr @@ -1 +1 @@ -ERROR: merge conflict: "kind" of morphology hello-stratum +ERROR: merge conflict: "kind" of morphology hello-stratum changed from chunk to stratum |