diff options
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index 684411694f..52be2fa2f4 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -20,8 +20,7 @@ static const char *diff_index_args[] = { int cmd_merge_ours(int argc, const char **argv, const char *prefix) { - if (argc == 2 && !strcmp(argv[1], "-h")) - usage(builtin_merge_ours_usage); + check_help_option(argc, argv, builtin_merge_ours_usage, NULL); /* * We need to exit with 2 if the index does not match our HEAD tree, |