pull: pass --allow-unrelated-histories to "git merge"

diff --git a/parse-options.h b/parse-options.h
index e8b55ea87aaea6a0e16239fd9b2025c4927d2145..ea4af92a5110554c450665e08fce3a97310e5640 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -199,7 +199,7 @@ enum {
 struct parse_opt_ctx_t {
        const char **argv;
        const char **out;
-       int argc, cpidx;
+       int argc, cpidx, total;
        const char *opt;
        int flags;
        const char *prefix;