undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Junio C Hamano 2009-11-30 14:44:43 -08:00
commit 22c4e72d6e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-merge.c
View File

@ -107,8 +107,8 @@ static struct strategy *get_strategy(const char *name)
found = 1; found = 1;
if (!found) if (!found)
add_cmdname(&not_strategies, ent->name, ent->len); 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)) { if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
fprintf(stderr, "Could not find merge strategy '%s'.\n", name); fprintf(stderr, "Could not find merge strategy '%s'.\n", name);