From 47ccbd4d3d7a2bbfa3c840f442f00528c88f5a45 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 3 Oct 2012 14:44:22 +0100 Subject: Fix after review --- tests.branching/merge-handles-unmergable-cases.stderr | 2 +- tests.branching/merge-with-stratum-renamed.stdout | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 tests.branching/merge-with-stratum-renamed.stdout (limited to 'tests.branching') 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 -- cgit v1.2.1