[thirdparty/git.git] / merge-blobs.h

#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 */
Commit	Line	Data
fa2364ec JH	1	#ifndef MERGE_BLOBS_H
	2	#define MERGE_BLOBS_H
	3
f4a55b27 NTND	4	struct blob;
f4a55b27 NTND	5	struct index_state;
fa2364ec	6
55454427	7	void merge_blobs(struct index_state , const char *,
ad6dad09 DL	8	struct blob , struct blob ,
ad6dad09 DL	9	struct blob , unsigned long );
fa2364ec JH	10
fa2364ec JH	11	#endif /* MERGE_BLOBS_H */