# # # patch "testsuite.lua" # from [bef5b5452ebc2d179f8f87884b0a835d4fc38e7c] # to [ace65535c8e4ff3106a8c3ba96fdb29086848dc8] # ============================================================ --- testsuite.lua bef5b5452ebc2d179f8f87884b0a835d4fc38e7c +++ testsuite.lua ace65535c8e4ff3106a8c3ba96fdb29086848dc8 @@ -344,17 +344,3 @@ table.sort(tests) end end table.sort(tests) -table.insert(tests, "merge_into_workspace") -table.insert(tests, "merge_into_workspace_no_changes") -table.insert(tests, "merge_into_workspace_files_added") -table.insert(tests, "merge_into_workspace_attr_corpse") -table.insert(tests, "merge_into_workspace_same_rev") -table.insert(tests, "two_parent_workspace_commands_that_fail") -table.insert(tests, "two_parent_workspace_pluck") -table.insert(tests, "two_parent_workspace_add_drop_rename") -table.insert(tests, "two_parent_workspace_attrs") -table.insert(tests, "two_parent_workspace_pivot_root") -table.insert(tests, "two_parent_workspace_inodeprints") -table.insert(tests, "two_parent_workspace_inodeprint_from_birth") -table.insert(tests, "two_parent_workspace_annotate") -table.insert(tests, "two_parent_workspace_list")