git-pull.sh: Fix call to git-merge for new command format

diff --git a/usage.c b/usage.c
index e307e01b99ccc55a82040066499ad3651cd2407a..79856a2b9f5bc4603252cb10b471a0815416a617 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -7,7 +7,7 @@
 
 static void report(const char *prefix, const char *err, va_list params)
 {
-       char msg[1024];
+       char msg[4096];
        vsnprintf(msg, sizeof(msg), err, params);
        fprintf(stderr, "%s%s\n", prefix, msg);
 }