Merge branch 'mh/multimail'

diff --git a/remote-testsvn.c b/remote-testsvn.c
index 5ddf11cc61e22e39f28b3cbe0dbd1075c0881556..d7cd5d272fd23624223f37ec8bda7d4fa8c39bce 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -286,7 +286,7 @@ static int do_command(struct strbuf *line)
        return 0;
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT,
                        private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT,