Imported Upstream version 2.24.1

[platform/upstream/git.git] / merge-blobs.h

diff --git a/merge-blobs.h b/merge-blobs.h
index 62b569e..13cf966 100644 (file)
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -1,8 +1,11 @@
 #ifndef MERGE_BLOBS_H
 #define MERGE_BLOBS_H
 
-#include "blob.h"
+struct blob;
+struct index_state;
 
-extern void *merge_blobs(const char *, struct blob *, struct blob *, struct blob *, unsigned long *);
+void *merge_blobs(struct index_state *, const char *,
+                 struct blob *, struct blob *,
+                 struct blob *, unsigned long *);
 
 #endif /* MERGE_BLOBS_H */