# 
# patch "ChangeLog"
#  from [99e97a96aa0f73a9de55a042ed7f5a71f20c0dad]
#    to [2ee7e1d4714ef538efd8bee5ceed6d543f2299d5]
# 
# patch "tests/t_fmerge.at"
#  from [3cfb07482b75f84a452a2173a8a0e9747c11394f]
#    to [05780baeb97e02d1d841f3f89ecf268d2d34fd23]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-05-30  Matt Johnston  <address@hidden>
 
+	* tests/t_fmerge.at: scrap all the diff3/ed, just compare it with
+	known-good output.
+
+2005-05-30  Matt Johnston  <address@hidden>
+
 	* tests/t_fmerge.at: make sure we write the file with the ed script.
 
 2005-05-30  Matt Johnston  <address@hidden>
--- tests/t_fmerge.at
+++ tests/t_fmerge.at
@@ -231,10 +231,7 @@
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout merge.monotone, [], [ignore], [ignore])
 
-AT_CHECK(cp left merge.diff3)
-AT_CHECK(echo w > write)
-AT_CHECK(diff3 -E left ancestor right | cat - write | ed merge.diff3, [], [ignore], [ignore])
+# we expect the output to be the same as the right file in this case
+AT_CHECK(cmp merge.monotone right, [], [ignore], [ignore])
 
-AT_CHECK(cmp merge.monotone merge.diff3, [], [ignore], [ignore])
-
 AT_CLEANUP