parse-options: replace opterror() with optname()

diff --git a/builtin/merge.c b/builtin/merge.c
index 92ba7e1c6dc2a7d3cce1259ec6faaead188f53d9..82248d43c3f7e21743b2ce3bc60aaa4e2af5ea6a 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -128,7 +128,7 @@ static int option_read_message(struct parse_opt_ctx_t *ctx,
                ctx->argc--;
                arg = *++ctx->argv;
        } else
-               return opterror(opt, "requires a value", 0);
+               return error(_("option `%s' requires a value"), opt->long_name);
 
        if (buf->len)
                strbuf_addch(buf, '\n');