completion: add more parameter value completion

diff --git a/merge-recursive.c b/merge-recursive.c
index 4851825aebf29d129aa4b82d860adcbb2697a300..28b36c08f2a8dff017bfb8cbfec5b98ea2e04093 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3764,6 +3764,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
                        return -1;
                o->merge_detect_rename = 1;
        }
+       /*
+        * Please update $__git_merge_strategy_options in
+        * git-completion.bash when you add new options
+        */
        else
                return -1;
        return 0;