Merge branch 'jc/setlinebuf-setvbuf'

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index dcd08f76b18995e306a80092fba223796e2e9ad6..9ad9791068c9330f28413ac67315246989c8d96d 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -93,8 +93,6 @@ static struct strategy *get_strategy(const char *name)
                struct cmdnames not_strategies;
                loaded = 1;
 
-               memset(&main_cmds, 0, sizeof(struct cmdnames));
-               memset(&other_cmds, 0, sizeof(struct cmdnames));
                memset(&not_strategies, 0, sizeof(struct cmdnames));
                load_command_list("git-merge-", &main_cmds, &other_cmds);
                for (i = 0; i < main_cmds.cnt; i++) {