# # patch "tests/t_fmerge.at" # from [1dbb47fa9d49865909fdb6fb5a71184373d89f01] # to [3cfb07482b75f84a452a2173a8a0e9747c11394f] # --- tests/t_fmerge.at +++ tests/t_fmerge.at @@ -233,7 +233,7 @@ AT_CHECK(cp left merge.diff3) AT_CHECK(echo w > write) -AT_CHECK(diff3 -E left ancestor right | cat - write | ed merge.diff3, [], [], [ignore]) +AT_CHECK(diff3 -E left ancestor right | cat - write | ed merge.diff3, [], [ignore], [ignore]) AT_CHECK(cmp merge.monotone merge.diff3, [], [ignore], [ignore])