# 
# 
# patch "tests/merge_into_workspace/__driver__.lua"
#  from [decc7983de7719c201ca985325d285aae0226075]
#    to [b27804256d7f93176054f951422b3d7dc9204203]
# 
# patch "tests/merge_into_workspace_attr_corpse/__driver__.lua"
#  from [e02012748af6259468d3c87d3d125f089314ff7a]
#    to [7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf]
# 
============================================================
--- tests/merge_into_workspace/__driver__.lua	decc7983de7719c201ca985325d285aae0226075
+++ tests/merge_into_workspace/__driver__.lua	b27804256d7f93176054f951422b3d7dc9204203
@@ -84,9 +84,11 @@ check(mtn("log", "--no-graph", "testfile
 check(get("expected-log-left"))
 
 check(mtn("log", "--no-graph", "testfile"), 0, true, nil)
+canonicalize("stdout")
 check(samefile_ignore_dates("stdout", "expected-log"))
 
 check(mtn("log", "--no-graph", "--from", left), 0, true, nil)
+canonicalize("stdout")
 check(samefile_ignore_dates("stdout", "expected-log-left"))
 
 -- a commit at this point should succeed
============================================================
--- tests/merge_into_workspace_attr_corpse/__driver__.lua	e02012748af6259468d3c87d3d125f089314ff7a
+++ tests/merge_into_workspace_attr_corpse/__driver__.lua	7f01da1af5eedec9debf4f2d8f1dd7ec14561dcf
@@ -42,7 +42,9 @@ check(get("expected-roster"))
 -- in-database merge would generate; in particular, both "left-attr"
 -- and "right-attr" should show up as "dormant_attr"s.
 check(get("expected-roster"))
-check(mtn("get_roster"), 0, {"expected-roster"}, nil)
+check(mtn("get_roster"), 0, true, nil)
+canonicalize("stdout")
+check(samefile("expected-roster", "stdout"))
 
 -- a commit at this point should succeed
 commit()