Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: df3c41adeb212432c53d93ce6ace5d5374dc6e11 authored by Junio C Hamano on 14 January 2022, 23:26:53 UTC
Git 2.35-rc1
Tip revision: df3c41a
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