aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-30 14:44:43 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-30 14:44:43 -0800
commit22c4e72d6eef8295a3311f6eb2f82a5494f8b88e (patch)
tree8bffa625a10a3e3e0e60db86ea5017565a1d99fd /builtin-merge.c
parent684d0d8dcfa2288744a553fc7294c5f9f5c12026 (diff)
parented87465658c83a5a1617920e7b605bd830a78aed (diff)
downloadgit-22c4e72d6eef8295a3311f6eb2f82a5494f8b88e.tar.gz
git-22c4e72d6eef8295a3311f6eb2f82a5494f8b88e.tar.xz
Merge branch 'ap/maint-merge-strategy-list-fix'
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index 57eedd447..855cf6545 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -107,8 +107,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);