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

diff --git a/url.h b/url.h
index abdaf6fa30b68767f48b056c977e498f9cfe7de2..f311c40a4680bfedf0ad2d511a5599fb5dcabd6e 100644 (file)
--- a/url.h
+++ b/url.h
@@ -1,6 +1,8 @@
 #ifndef URL_H
 #define URL_H
 
+struct strbuf;
+
 extern int is_url(const char *url);
 extern int is_urlschemechar(int first_flag, int ch);
 extern char *url_decode(const char *url);