bash: add missing 'git merge' options

diff --git a/help.h b/help.h
index 2733433bf0c74a4d1297a0b3dd6435ac00c872f2..56bc15406ffc55115fa1c827e0d1d5a7e74c516d 100644 (file)
--- a/help.h
+++ b/help.h
@@ -5,7 +5,7 @@ struct cmdnames {
        int alloc;
        int cnt;
        struct cmdname {
-               size_t len;
+               size_t len; /* also used for similarity index in help.c */
                char name[FLEX_ARRAY];
        } **names;
 };