# 
# 
# rename "tests/merge(<>,_<add_a,_drop_a,_add_a>)"
#     to "tests/merge((),_(add_a,_drop_a,_add_a))"
# 
# rename "tests/merge(<>,_<add_a,_patch_a,_drop_a,_add_a>)"
#     to "tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))"
# 
# rename "tests/merge(<>,_<patch_a,_drop_a,_add_a>)"
#     to "tests/merge((),_(patch_a,_drop_a,_add_a))"
# 
# rename "tests/merge(<add_a>,_<add_a,_drop_a,_add_a>)"
#     to "tests/merge((add_a),_(add_a,_drop_a,_add_a))"
# 
# rename "tests/merge(<patch_a>,_<drop_a,_add_a>)"
#     to "tests/merge((patch_a),_(drop_a,_add_a))"
# 
# rename "tests/merging_<add_a>_with_<add_a,_drop_a>"
#     to "tests/merging_(add_a)_with_(add_a,_drop_a)"
# 
# patch "testsuite.lua"
#  from [359e2064fbe1caf24a83e54de731684341da2f01]
#    to [e0d5e311142f30267775ff2076bffd665ff37a7a]
# 
============================================================
--- testsuite.lua	359e2064fbe1caf24a83e54de731684341da2f01
+++ testsuite.lua	e0d5e311142f30267775ff2076bffd665ff37a7a
@@ -311,13 +311,13 @@
 table.insert(tests, "tests/tags_and_tagging_of_revisions")
 table.insert(tests, "tests/mtn_add_.")
 table.insert(tests, "tests/(minor)_update_cleans_emptied_directories")
-table.insert(tests, "tests/merging_<add_a>_with_<add_a,_drop_a>")
+table.insert(tests, "tests/merging_(add_a)_with_(add_a,_drop_a)")
 table.insert(tests, "tests/merging_an_add_edge")
-table.insert(tests, "tests/merge(<>,_<patch_a,_drop_a,_add_a>)")
-table.insert(tests, "tests/merge(<>,_<add_a,_drop_a,_add_a>)")
-table.insert(tests, "tests/merge(<add_a>,_<add_a,_drop_a,_add_a>)")
-table.insert(tests, "tests/merge(<>,_<add_a,_patch_a,_drop_a,_add_a>)")
-table.insert(tests, "tests/merge(<patch_a>,_<drop_a,_add_a>)")
+table.insert(tests, "tests/merge((),_(patch_a,_drop_a,_add_a))")
+table.insert(tests, "tests/merge((),_(add_a,_drop_a,_add_a))")
+table.insert(tests, "tests/merge((add_a),_(add_a,_drop_a,_add_a))")
+table.insert(tests, "tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))")
+table.insert(tests, "tests/merge((patch_a),_(drop_a,_add_a))")
 table.insert(tests, "tests/explicit_merge")
 table.insert(tests, "tests/update_with_multiple_candidates")
 table.insert(tests, "tests/checkout_validates_target_directory")