contrib/completion: add smerge to the mergetool completion candidates

diff --git a/submodule.c b/submodule.c
index 174003a847aa9a8c6de666fc24ece9213ccb0921..21cf50ca15e124edb67b4aa76ae87577816eb1a5 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -432,6 +432,10 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
                diffopt->flags.ignore_dirty_submodules = 1;
        else if (strcmp(arg, "none"))
                die("bad --ignore-submodules argument: %s", arg);
+       /*
+        * Please update _git_status() in git-completion.bash when you
+        * add new options
+        */
 }
 
 static int prepare_submodule_summary(struct rev_info *rev, const char *path,