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

* ap/maint-merge-strategy-list-fix:
  builtin-merge.c: call exclude_cmds() correctly.
This commit is contained in:
Junio C Hamano 2009-12-03 13:54:11 -08:00
Родитель 78b77c491f ed87465658
Коммит 99292c638a
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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);