Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign

diff --git a/t/helper/test-regex.c b/t/helper/test-regex.c
index eff26f534fc21e3d77bc3d6cf76fce2b5a74e981..b5ea8a97c54e1737d91dec894c1cc02e1baf64e5 100644 (file)
--- a/t/helper/test-regex.c
+++ b/t/helper/test-regex.c
@@ -36,7 +36,7 @@ static int test_regex_bug(void)
        return 0;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char *pat;
        const char *str;