]>
git.ipfire.org Git - thirdparty/git.git/blob - merge-recursive.h
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 int merge_recursive(struct commit
*h1
,
8 struct commit_list
*ancestors
,
9 struct commit
**result
);
11 int merge_trees(struct tree
*head
,
16 struct tree
**result
);
18 struct tree
*write_tree_from_memory(void);