about summary refs log tree commit diff
path: root/third_party/git/merge-blobs.h
diff options
context:
space:
mode:
authorVincent Ambo <Vincent Ambo>2020-01-11T23·36+0000
committerVincent Ambo <Vincent Ambo>2020-01-11T23·40+0000
commit7ef0d62730840ded097b524104cc0a0904591a63 (patch)
treea670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/merge-blobs.h
parent6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff)
parent1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff)
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/merge-blobs.h')
-rw-r--r--third_party/git/merge-blobs.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/third_party/git/merge-blobs.h b/third_party/git/merge-blobs.h
new file mode 100644
index 000000000000..13cf9669e5b2
--- /dev/null
+++ b/third_party/git/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 */