mergetool: Add support for vimdiff.

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 06c42b042d999856aacb9e156cffc39eb8dbce3f..975777f05ed69ef78f1fd91ac512f5b92a384141 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -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