author | Junio C Hamano <gitster@pobox.com> | |
Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 3 Dec 2009 21:54:11 +0000 (13:54 -0800) |
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
builtin-merge.c: call exclude_cmds() correctly.
builtin-merge.c | patch | blob | history |
diff --git a/builtin-merge.c b/builtin-merge.c
index 2871419143d4aa02c46db9dcd794eaa9dba50c23..d3eb5092c8b20b157fe7c2560d293d6a232a37fd 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
found = 1;
if (!found)
add_cmdname(¬_strategies, ent->name, ent->len);
- exclude_cmds(&main_cmds, ¬_strategies);
}
+ exclude_cmds(&main_cmds, ¬_strategies);
}
if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
fprintf(stderr, "Could not find merge strategy '%s'.\n", name);