Skip to main content

Browse the archive

Staging
v0.5.1
Revision 65f59e2998c7dd87f61b25fa41bba72fd4247901 authored by Junio C Hamano on 13 August 2008, 04:42:22 UTC, committed by Junio C Hamano on 13 August 2008, 05:46:33 UTC 
GIT 1.6.0-rc3
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fc721b6
Raw File
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