rerere: teach rerere to handle nested conflicts

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index f0284cc7cf5fb25cd173c9c888b35d4f18b8a32d..805a45de9c877d9e5fecb6aa543e6ac985443d5b 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -32,13 +32,23 @@ static struct test_cmd cmds[] = {
        { "revision-walking", cmd__revision_walking },
        { "run-command", cmd__run_command },
        { "scrap-cache-tree", cmd__scrap_cache_tree },
+       { "sha1-array", cmd__sha1_array },
        { "sha1", cmd__sha1 },
+       { "sigchain", cmd__sigchain },
+       { "strcmp-offset", cmd__strcmp_offset },
+       { "string-list", cmd__string_list },
+       { "submodule-config", cmd__submodule_config },
+       { "subprocess", cmd__subprocess },
+       { "urlmatch-normalization", cmd__urlmatch_normalization },
+       { "wildmatch", cmd__wildmatch },
+       { "write-cache", cmd__write_cache },
 };
 
 int cmd_main(int argc, const char **argv)
 {
        int i;
 
+       BUG_exit_code = 99;
        if (argc < 2)
                die("I need a test name!");