Skip to main content

Browse the archive

Revision 3526e67d917bcd03f317a058208fa02737654637 authored by Junio C Hamano on 08 February 2024, 23:56:45 UTC, committed by Junio C Hamano on 09 February 2024, 00:22:12 UTC 
Git 2.43.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 963eda2
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