Merge branch 'ap/maint-merge-strategy-list-fix' into maint

* ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly.
git-mirror · Dec 3, 2009 · 99292c6 · 99292c6
2 parents 78b77c4 + ed87465
commit 99292c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin-merge.c b/builtin-merge.c
@@ -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);