Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision 965d445b2dfc2558babb238685aef6f1987230b1 authored by Junio C Hamano on 02 November 2023, 07:53:25 UTC, committed by Junio C Hamano on 02 November 2023, 07:53:25 UTC 
Merge branch 'ch/clean-docfix' into maint-2.42
 
Typofix.

* ch/clean-docfix:
  git-clean doc: fix "without do cleaning" typo
2 parent s 905765b + 563f339
Raw File
Tip revision: 965d445b2dfc2558babb238685aef6f1987230b1 authored by Junio C Hamano on 02 November 2023, 07:53:25 UTC
Merge branch 'ch/clean-docfix' into maint-2.42
Tip revision: 965d445
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