pull: check if in unresolved merge state

diff --git a/send-pack.h b/send-pack.h
index 56354577467acfe1bf98652f6bfad9ad7e5db851..b6646488aaf93814c5053d79528c1b5a4d19bcb5 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -13,7 +13,8 @@ struct send_pack_args {
                use_ofs_delta:1,
                dry_run:1,
                push_cert:1,
-               stateless_rpc:1;
+               stateless_rpc:1,
+               atomic:1;
 };
 
 int send_pack(struct send_pack_args *args,