Merge branch 'js/ignore-space-at-eol'

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 2c63298fab10563bcd8c98c3d0b6d563164e2283..a01430c24bdb8c0e35147b71d6f9e898405b1c85 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -94,7 +94,7 @@ static void show(struct string_list *expect, int *status, const char *fmt, ...)
        strbuf_release(&buf);
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char *prefix = "prefix/";
        const char *usage[] = {