about summary refs log tree commit diff
path: root/third_party/git/merge-blobs.h
blob: 13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
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 */