]> git.ipfire.org Git - thirdparty/git.git/blob - merge-blobs.h
Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint
[thirdparty/git.git] / merge-blobs.h
1 #ifndef MERGE_BLOBS_H
2 #define MERGE_BLOBS_H
3
4 struct blob;
5 struct index_state;
6
7 void *merge_blobs(struct index_state *, const char *,
8 struct blob *, struct blob *,
9 struct blob *, unsigned long *);
10
11 #endif /* MERGE_BLOBS_H */