Merge branch 'kb/diff-C-M-synonym'

diff --git a/builtin/merge.c b/builtin/merge.c
index 3921cd304086cbc2edff0e1481f7c7395df8b00a..42fff387e69d9b5412e8e776aed3272b78ebe758 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -922,6 +922,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        const char *best_strategy = NULL, *wt_strategy = NULL;
        struct commit_list **remotes = &remoteheads;
 
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage_with_options(builtin_merge_usage, builtin_merge_options);
+
        /*
         * Check if we are _not_ on a detached HEAD, i.e. if there is a
         * current branch.