Commits

Junio C Hamano  committed 99292c6 Merge

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

* ap/maint-merge-strategy-list-fix:
builtin-merge.c: call exclude_cmds() correctly.

  • Participants
  • Parent commits 78b77c4, ed87465

Comments (0)

Files changed (1)

File builtin-merge.c

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