File: merge-ort-wrappers.h

package info (click to toggle)
git 1%3A2.49.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 60,704 kB
  • sloc: ansic: 302,835; sh: 258,322; perl: 29,461; tcl: 22,310; makefile: 4,310; python: 3,442; javascript: 772; csh: 45; lisp: 12
file content (25 lines) | stat: -rw-r--r-- 644 bytes parent folder | download | duplicates (6) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
 
#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,
			const struct commit_list *ancestors,
			struct commit **result);

#endif