Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 876b1423317071f43c99666f3fc3db3642dfbe14 authored by Junio C Hamano on 03 November 2021, 20:32:40 UTC
Git 2.34-rc1
Tip revision: 876b142
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
back to top