Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision e449f105805ffa49ccf7cf080db897ecf65a1a0f authored by Junio C Hamano on 18 June 2008, 20:09:43 UTC, committed by Junio C Hamano on 18 June 2008, 20:09:43 UTC 
GIT 1.5.6
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9a7bbd1
Raw File
Tip revision: e449f105805ffa49ccf7cf080db897ecf65a1a0f authored by Junio C Hamano on 18 June 2008, 20:09:43 UTC
GIT 1.5.6
Tip revision: e449f10
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
back to top