[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
	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 */