# 
# patch "ChangeLog"
#  from [f6cdda7edce9883de78d2735ca3bdfc4ef6db543]
#    to [99e97a96aa0f73a9de55a042ed7f5a71f20c0dad]
# 
# patch "tests/t_fmerge.at"
#  from [36444e113e47fc902395964173dd551d9e923ce7]
#    to [1dbb47fa9d49865909fdb6fb5a71184373d89f01]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 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>
+
 	* testsuite.at: use "command -v" rather than "which", since
 	Solaris doesn't give useful exit codes for "which".
 	* tests/t_fmerge.at: don't use --merge with diff3, pipe to ed instead
--- tests/t_fmerge.at
+++ tests/t_fmerge.at
@@ -232,7 +232,8 @@
 AT_CHECK(mv stdout merge.monotone, [], [ignore], [ignore])
 
 AT_CHECK(cp left merge.diff3)
-AT_CHECK(diff3 -E left ancestor right | ed merge.diff3, [], [], [ignore])
+AT_CHECK(echo w > write)
+AT_CHECK(diff3 -E left ancestor right | cat - write | ed merge.diff3, [], [], [ignore])
 
 AT_CHECK(cmp merge.monotone merge.diff3, [], [ignore], [ignore])