1 #ifndef MERGE_ORT_WRAPPERS_H
2 #define MERGE_ORT_WRAPPERS_H
4 #include "merge-recursive.h"
7 * rename-detecting three-way merge, no recursion.
8 * Wrapper mimicking the old merge_trees() function.
10 int merge_ort_nonrecursive(struct merge_options *opt,
16 * rename-detecting three-way merge with recursive ancestor consolidation.
17 * Wrapper mimicking the old merge_recursive() function.
19 int merge_ort_recursive(struct merge_options *opt,
22 struct commit_list *ancestors,
23 struct commit **result);