Merge branch 'fr_v2.34.0_rnd3' of github.com:jnavila/git
[alt-git.git] / merge-blobs.h
blob13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65
1 #ifndef MERGE_BLOBS_H
2 #define MERGE_BLOBS_H
4 struct blob;
5 struct index_state;
7 void *merge_blobs(struct index_state *, const char *,
8 struct blob *, struct blob *,
9 struct blob *, unsigned long *);
11 #endif /* MERGE_BLOBS_H */