Revision abcb63fb70a69956a892fa830f3866098797787c authored by Johannes Schindelin on 11 March 2023, 19:47:34 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:57 UTC
Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent d6e9f67
merge-ort-wrappers.h
#ifndef MERGE_ORT_WRAPPERS_H
#define MERGE_ORT_WRAPPERS_H
#include "merge-recursive.h"
/*
* rename-detecting three-way merge, no recursion.
* Wrapper mimicking the old merge_trees() function.
*/
int merge_ort_nonrecursive(struct merge_options *opt,
struct tree *head,
struct tree *merge,
struct tree *common);
/*
* rename-detecting three-way merge with recursive ancestor consolidation.
* Wrapper mimicking the old merge_recursive() function.
*/
int merge_ort_recursive(struct merge_options *opt,
struct commit *h1,
struct commit *h2,
struct commit_list *ancestors,
struct commit **result);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...