You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
443 B
21 lines
443 B
17 years ago
|
#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
|