diff options
author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
---|---|---|
committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
commit | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (patch) | |
tree | e3accb9beed5c4c1b5a05c99db71ab2841f0ed04 /merge-blobs.h |
Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
Diffstat (limited to 'merge-blobs.h')
-rw-r--r-- | merge-blobs.h | 11 |
1 files changed, 11 insertions, 0 deletions
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 */ |