Merge branch 'sb/archive-zip-double-assignment-fix'

diff --git a/test-mergesort.c b/test-mergesort.c
index 3f388b4ce0bde90ff5593b42948338d5b73e8da9..ea3b959e94ff6f53726d4fce955bca1181a3be07 100644 (file)
--- a/test-mergesort.c
+++ b/test-mergesort.c
@@ -22,7 +22,7 @@ static int compare_strings(const void *a, const void *b)
        return strcmp(x->text, y->text);
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        struct line *line, *p = NULL, *lines = NULL;
        struct strbuf sb = STRBUF_INIT;