summaryrefslogtreecommitdiffstats
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:47:53 +0000
commitc8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch)
tree24e09d9f84dec336720cf393e156089ca2835791 /merge-blobs.h
parentInitial commit. (diff)
downloadgit-c8bae7493d2f2910b57f13ded012e86bdcfb0532.tar.xz
git-c8bae7493d2f2910b57f13ded012e86bdcfb0532.zip
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'merge-blobs.h')
-rw-r--r--merge-blobs.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/merge-blobs.h b/merge-blobs.h
new file mode 100644
index 0000000..13cf966
--- /dev/null
+++ b/merge-blobs.h
@@ -0,0 +1,11 @@
+#ifndef MERGE_BLOBS_H
+#define MERGE_BLOBS_H
+
+struct blob;
+struct index_state;
+
+void *merge_blobs(struct index_state *, const char *,
+ struct blob *, struct blob *,
+ struct blob *, unsigned long *);
+
+#endif /* MERGE_BLOBS_H */