diff options
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a4a098f40f..69effd3239 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1110,8 +1110,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) void *branch_to_free; int orig_argc = argc; - if (argc == 2 && !strcmp(argv[1], "-h")) - usage_with_options(builtin_merge_usage, builtin_merge_options); + check_help_option(argc, argv, builtin_merge_usage, builtin_merge_options); /* * Check if we are _not_ on a detached HEAD, i.e. if there is a |