7ef0d62730
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
11 lines
232 B
C
11 lines
232 B
C
#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 */
|