diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-03 14:44:22 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-10-03 14:44:32 +0100 |
| commit | 47ccbd4d3d7a2bbfa3c840f442f00528c88f5a45 (patch) | |
| tree | cecfdd96a67fe39ad0ad36e9a1bafb3b429250b4 /tests.branching | |
| parent | ce8732a7d4321e815a90abde5fa9caaa263fbdc1 (diff) | |
| download | morph-47ccbd4d3d7a2bbfa3c840f442f00528c88f5a45.tar.gz | |
Fix after review
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/merge-handles-unmergable-cases.stderr | 2 | ||||
| -rw-r--r-- | tests.branching/merge-with-stratum-renamed.stdout | 0 |
2 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 diff --git a/tests.branching/merge-with-stratum-renamed.stdout b/tests.branching/merge-with-stratum-renamed.stdout deleted file mode 100644 index e69de29b..00000000 --- a/tests.branching/merge-with-stratum-renamed.stdout +++ /dev/null |