Skip to main content

Browse the archive

Revision 6a6621fe9a226f15f3107fd559928e9b78b51cc2 authored by Junio C Hamano on 24 May 2023, 20:53:55 UTC, committed by Junio C Hamano on 24 May 2023, 20:53:55 UTC 
Merge branch 'sl/sparse-write-tree-part-2'
 
Fix-up to a topic already graduated to 'master'.

* sl/sparse-write-tree-part-2:
  t1092: update a write-tree test
2 parent s 9e49351 + 6e21017
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