From 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 11 Jan 2020 23:36:56 +0000 Subject: Squashed 'third_party/git/' content from commit cb71568594 git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7 --- merge-blobs.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 merge-blobs.h (limited to 'merge-blobs.h') diff --git a/merge-blobs.h b/merge-blobs.h new file mode 100644 index 000000000000..13cf9669e5b2 --- /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 */ -- cgit 1.4.1