Merge branch 'jk/fsck-doc'

diff --git a/merge-recursive.c b/merge-recursive.c
index f270fa66f3b54ca4a8eaf9358f4e53631c853f70..6c40c61c4728d9224006768599d7bf2ded744bb1 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3759,6 +3759,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;