Skip to main content

Browse the archive

Staging
v0.5.1
Revision de88ac70f3a801262eb3aa087e5d9a712be0a54a authored by Junio C Hamano on 22 May 2021, 09:27:45 UTC, committed by Junio C Hamano on 22 May 2021, 09:29:01 UTC 
Git 2.32-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 378c7c6
Raw File
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