Merge git://repo.or.cz/git-gui

diff --git a/help.c b/help.c
index 5da8c9c415fa9bbd93470ddb27e748079be4ef79..10298fb0a197f18008783214de11e424fbadb77d 100644 (file)
--- a/help.c
+++ b/help.c
@@ -30,6 +30,7 @@ static struct option builtin_help_options[] = {
                        HELP_FORMAT_WEB),
        OPT_SET_INT('i', "info", &help_format, "show info page",
                        HELP_FORMAT_INFO),
+       OPT_END(),
 };
 
 static const char * const builtin_help_usage[] = {
@@ -139,7 +140,7 @@ static int add_man_viewer(const char *value)
        else if (!strcasecmp(value, "konqueror"))
                do_add_man_viewer(exec_man_konqueror);
        else
-               return error("'%s': unsupported man viewer.", value);
+               warning("'%s': unsupported man viewer.", value);
 
        return 0;
 }