| Elijah Newren | 47b1e89 | 2020-10-27 02:08:08 +0000 | [diff] [blame] | 1 | #ifndef MERGE_ORT_WRAPPERS_H |
| 2 | #define MERGE_ORT_WRAPPERS_H |
| 3 | |
| 4 | #include "merge-recursive.h" |
| 5 | |
| 6 | /* |
| 7 | * rename-detecting three-way merge, no recursion. |
| 8 | * Wrapper mimicking the old merge_trees() function. |
| 9 | */ |
| 10 | int 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 | */ |
| 19 | int merge_ort_recursive(struct merge_options *opt, |
| 20 | struct commit *h1, |
| 21 | struct commit *h2, |
| 22 | struct commit_list *ancestors, |
| 23 | struct commit **result); |
| 24 | |
| 25 | #endif |
