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);
17 struct commit *make_virtual_commit(struct tree *tree, const char *comment);
18 int merge_recursive_config(const char *var, const char *value, void *cb);
19 void merge_recursive_setup(int is_subtree_merge);
20 struct tree *write_tree_from_memory(void);
22 extern int merge_recursive_verbosity;