freshlybakedca.ke
Git fork
1#ifndef MERGE_ORT_WRAPPERS_H
2#define MERGE_ORT_WRAPPERS_H
3
4#include "merge-ort.h"
5
6/*
7 * rename-detecting three-way merge, no recursion.
8 * Wrapper mimicking the old merge_trees() function.
9 */
10int merge_ort_nonrecursive(struct merge_options *opt,
11 struct tree *head,
12 struct tree *merge,
13 struct tree *common);
14
15/*
16 * rename-detecting three-way merge with recursive ancestor consolidation.
17 * Wrapper mimicking the old merge_recursive() function.
18 */
19int merge_ort_recursive(struct merge_options *opt,
20 struct commit *h1,
21 struct commit *h2,
22 const struct commit_list *ancestors,
23 struct commit **result);
24
25/*
26 * rename-detecting three-way merge. num_merge_bases must be at least 1.
27 * Recursive ancestor consolidation will be performed if num_merge_bases > 1.
28 * Wrapper mimicking the old merge_recursive_generic() function.
29 */
30int merge_ort_generic(struct merge_options *opt,
31 const struct object_id *head,
32 const struct object_id *merge,
33 int num_merge_bases,
34 const struct object_id *merge_bases,
35 struct commit **result);
36
37#endif