diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:54:11 -0800 |
| commit | 99292c638a5c011ce453c904357185d9f6c7dd62 (patch) | |
| tree | 104fca741d5078b3b41f1ecc38951aa34ef4dcf5 | |
| parent | Merge branch 'jc/maint-am-keep' into maint (diff) | |
| parent | builtin-merge.c: call exclude_cmds() correctly. (diff) | |
| download | tgif-99292c638a5c011ce453c904357185d9f6c7dd62.tar.xz | |
Merge branch 'ap/maint-merge-strategy-list-fix' into maint
* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 2871419143..d3eb5092c8 100644 --- 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(¬_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); |