builtin-merge.c: call exclude_cmds() correctly.
[gitweb.git] / builtin-merge.c
index b6b84286b26a4317dfd5185ae83fd861c6f9fa7d..4bcf7c7bce9fda004fcab7cf569f886bbcb387b4 100644 (file)
@@ -106,8 +106,8 @@ static struct strategy *get_strategy(const char *name)
                                        found = 1;
                        if (!found)
                                add_cmdname(&not_strategies, ent->name, ent->len);
-                       exclude_cmds(&main_cmds, &not_strategies);
                }
+               exclude_cmds(&main_cmds, &not_strategies);
        }
        if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
                fprintf(stderr, "Could not find merge strategy '%s'.\n", name);