Skip to main content

Browse the archive

Staging
v0.5.1
Revision 66262451ec94d30ac4b80eb3123549cf7a788afd authored by Junio C Hamano on 30 July 2021, 23:14:07 UTC, committed by Junio C Hamano on 02 August 2021, 21:06:43 UTC 
Git 2.33-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9bcdaab
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