contrib/completion: add smerge to the mergetool completion candidates

diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index b71bd1fb65bc6b9d6c6889b7dcf8d210d57f1e53..c0036f73789d1a6a3ff88a76c3838241e65ca868 100644 (file)
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -82,6 +82,10 @@ static int gently_parse_list_objects_filter(
                filter_options->sparse_path_value = strdup(v0);
                return 0;
        }
+       /*
+        * Please update _git_fetch() in git-completion.bash when you
+        * add new filters
+        */
 
        if (errbuf)
                strbuf_addf(errbuf, "invalid filter-spec '%s'", arg);