# 
# 
# patch "ChangeLog"
#  from [8ed25ebd3ad4c77ff636a5abfcffc95b2210e6a5]
#    to [51b21b114cc1122f4eae125c0a588f6075e1e629]
# 
# patch "tests/test_a_merge_8/__driver__.lua"
#  from [fbeb6c265cb40e96fbe3760f4c59e3acc4dc025b]
#    to [984ec9927be019be94f0e959197ad9492637e68a]
# 
============================================================
--- ChangeLog	8ed25ebd3ad4c77ff636a5abfcffc95b2210e6a5
+++ ChangeLog	51b21b114cc1122f4eae125c0a588f6075e1e629
@@ -1,3 +1,8 @@
+2007-02-07  Markus Schiltknecht  <address@hidden>
+
+	* tests/test_a_merge_8/__driver__.lua: added xfail() and a bug id,
+	so that current tests run through fine.
+
 2007-02-07  Zack Weinberg  <address@hidden>
 
 	* charset.cc (system_to_utf8): Move below system_charset_is_utf8
============================================================
--- tests/test_a_merge_8/__driver__.lua	fbeb6c265cb40e96fbe3760f4c59e3acc4dc025b
+++ tests/test_a_merge_8/__driver__.lua	984ec9927be019be94f0e959197ad9492637e68a
@@ -26,4 +26,6 @@ check(mtn("update"), 0, false, false)
 check(mtn("--branch=testbranch", "merge"), 0, false, false)
 
 check(mtn("update"), 0, false, false)
+
+# triggers [bug #18989] merge failure
+xfail(check(samefile("testfile", "correct")))
-check(samefile("testfile", "correct"))