# 
# 
# patch "ChangeLog"
#  from [d8a765191b09f5dd406c998e824e97290f6464b4]
#    to [779e0b49b67180e1c3d131fca9dc4e4193aa2c01]
# 
# patch "tests/test_a_merge_8/__driver__.lua"
#  from [984ec9927be019be94f0e959197ad9492637e68a]
#    to [28fe384bfae0e6fea7e9ad46f1db5788c158ba13]
# 
============================================================
--- ChangeLog	d8a765191b09f5dd406c998e824e97290f6464b4
+++ ChangeLog	779e0b49b67180e1c3d131fca9dc4e4193aa2c01
@@ -1,5 +1,10 @@ 2007-02-07  Markus Schiltknecht  <markus
 2007-02-07  Markus Schiltknecht  <address@hidden>
 
+	* tests/test_a_merge_8/__driver__.lua: okay, sorry, that didn't work,
+	second try in adding xfail() to that test.
+
+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.
 
============================================================
--- tests/test_a_merge_8/__driver__.lua	984ec9927be019be94f0e959197ad9492637e68a
+++ tests/test_a_merge_8/__driver__.lua	28fe384bfae0e6fea7e9ad46f1db5788c158ba13
@@ -27,5 +27,5 @@ check(mtn("update"), 0, false, false)
 
 check(mtn("update"), 0, false, false)
 
+-- triggers [bug #18989] merge failure
+xfail(samefile("testfile", "correct"))
-# triggers [bug #18989] merge failure
-xfail(check(samefile("testfile", "correct")))