rerere: fix for merge.conflictstyle

diff --git a/fetch-pack.h b/fetch-pack.h
index 40f08bab24df917986de73c8d7f4d9d36fe658da..20ccc12e57b9499b0716c8295b4adea38d8d2a86 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -2,6 +2,7 @@
 #define FETCH_PACK_H
 
 #include "string-list.h"
+#include "run-command.h"
 
 struct fetch_pack_args {
        const char *uploadpack;
@@ -13,6 +14,7 @@ struct fetch_pack_args {
                use_thin_pack:1,
                fetch_all:1,
                stdin_refs:1,
+               diag_url:1,
                verbose:1,
                no_progress:1,
                include_tag:1,