#
#
# add_dir "tests/test_a_merge_9"
# 
# add_file "tests/test_a_merge_9/__driver__.lua"
#  content [54332139e117e174cc40d403de98a334f061ab4d]
# 
# add_file "tests/test_a_merge_9/left"
#  content [f74c88d29f816e31e6763151ae49d58374c73339]
# 
# add_file "tests/test_a_merge_9/parent"
#  content [a4f3c4f6fb6ac5ffffe009c9d26a33c875d240f3]
# 
# add_file "tests/test_a_merge_9/right"
#  content [2bcec58d77f69f584c86c885f314a24de71d5678]
#
============================================================
--- tests/test_a_merge_9/__driver__.lua	54332139e117e174cc40d403de98a334f061ab4d
+++ tests/test_a_merge_9/__driver__.lua	54332139e117e174cc40d403de98a334f061ab4d
@@ -0,0 +1,31 @@
+
+mtn_setup()
+
+-- This is (was) a real merge error.  'right' contains only a single
+-- added function; when it was really merged with 'left', the last
+-- line of this function was lost.
+
+-- This may actually be (have been) a bug in the unidiff algorithm;
+-- 'diff' and 'mtn diff' produce(d) different results when calculating
+-- diff(parent, left).
+
+check(get("parent"))
+check(get("left"))
+check(get("right"))
+
+copy("parent", "testfile")
+check(mtn("add", "testfile"), 0, false, false)
+commit(testbranch)
+parent = base_revision()
+
+copy("left", "testfile")
+commit()
+
+revert_to(parent)
+
+copy("right", "testfile")
+commit()
+
+-- should be a conflict
+xfail(mtn("merge"), 1, false, false)
+check(mtn("up"))
============================================================
--- tests/test_a_merge_9/left	f74c88d29f816e31e6763151ae49d58374c73339
+++ tests/test_a_merge_9/left	f74c88d29f816e31e6763151ae49d58374c73339
@@ -0,0 +1,3 @@
+A
+B'
+C
============================================================
--- tests/test_a_merge_9/parent	a4f3c4f6fb6ac5ffffe009c9d26a33c875d240f3
+++ tests/test_a_merge_9/parent	a4f3c4f6fb6ac5ffffe009c9d26a33c875d240f3
@@ -0,0 +1,3 @@
+A
+B
+C
============================================================
--- tests/test_a_merge_9/right	2bcec58d77f69f584c86c885f314a24de71d5678
+++ tests/test_a_merge_9/right	2bcec58d77f69f584c86c885f314a24de71d5678
@@ -0,0 +1,4 @@
+A
+A'
+B
+C