From 1342bf9006f28a08d1b32dc8218717ebda701dc2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 29 Oct 2012 16:02:42 +0000 Subject: Split merge tests out from the other branching tests Merge is by far the most complex of the branching and merging commands. --- tests.merging/conflict-morphology-kind.stderr | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests.merging/conflict-morphology-kind.stderr (limited to 'tests.merging/conflict-morphology-kind.stderr') 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 -- cgit v1.2.1