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

#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

int merge_recursive(struct commit *h1,
		    struct commit *h2,
		    const char *branch1,
		    const char *branch2,
		    struct commit_list *ancestors,
		    struct commit **result);

int merge_trees(struct tree *head,
		struct tree *merge,
		struct tree *common,
		const char *branch1,
		const char *branch2,
		struct tree **result);

struct tree *write_tree_from_memory(void);

#endif
Commit	Line	Data
e1b3a2ca DB	1	#ifndef MERGE_RECURSIVE_H
	2	#define MERGE_RECURSIVE_H
	3
	4	int merge_recursive(struct commit *h1,
	5	struct commit *h2,
	6	const char *branch1,
	7	const char *branch2,
	8	struct commit_list *ancestors,
	9	struct commit **result);
	10
	11	int merge_trees(struct tree *head,
	12	struct tree *merge,
	13	struct tree *common,
	14	const char *branch1,
	15	const char *branch2,
	16	struct tree **result);
	17
	18	struct tree *write_tree_from_memory(void);
	19
	20	#endif