merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/send-pack.h b/send-pack.h
index 6af71f7008127df0acb72cfaf3b679f7ef332a4e..e148fcd960994b1724f8d09c4ea4897b1cf069f0 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -3,6 +3,10 @@
 
 #include "string-list.h"
 
+struct child_process;
+struct oid_array;
+struct ref;
+
 /* Possible values for push_cert field in send_pack_args. */
 #define SEND_PACK_PUSH_CERT_NEVER 0
 #define SEND_PACK_PUSH_CERT_IF_ASKED 1