Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 5450918be339bf101a6562d518c0f4cc7b37c0f2..17df47b95067449f03039b8ecd7715701302fa68 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -4,10 +4,10 @@ echo "/* Automatically generated by $0 */
 struct cmdname_help
 {
     char name[16];
-    char help[64];
+    char help[80];
 };
 
-struct cmdname_help common_cmds[] = {"
+static struct cmdname_help common_cmds[] = {"
 
 sort <<\EOF |
 add
@@ -22,7 +22,7 @@ commit
 diff
 fetch
 grep
-init-db
+init
 log
 merge
 mv
@@ -37,7 +37,6 @@ show
 show-branch
 status
 tag
-verify-tag
 EOF
 while read cmd
 do