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 extern int merge_recursive_generic(const char **base_list
,
18 const unsigned char *head_sha1
, const char *head_name
,
19 const unsigned char *next_sha1
, const char *next_name
);
20 int merge_recursive_config(const char *var
, const char *value
, void *cb
);
21 void merge_recursive_setup(int is_subtree_merge
);
22 struct tree
*write_tree_from_memory(void);
24 extern int merge_recursive_verbosity
;