Code

Windows: TMP and TEMP environment variables specify a temporary directory.
[git.git] / merge-recursive.h
1 #ifndef MERGE_RECURSIVE_H
2 #define MERGE_RECURSIVE_H
4 int merge_recursive(struct commit *h1,
5                     struct commit *h2,
6                     const char *branch1,
7                     const char *branch2,
8                     struct commit_list *ancestors,
9                     struct commit **result);
11 int merge_trees(struct tree *head,
12                 struct tree *merge,
13                 struct tree *common,
14                 const char *branch1,
15                 const char *branch2,
16                 struct tree **result);
18 struct tree *write_tree_from_memory(void);
20 #endif