File: merge-recursive.h

package info (click to toggle)
git-core 1%3A1.5.6.5-3%2Blenny3.3
  • links: PTS
  • area: main
  • in suites: lenny
  • size: 12,112 kB
  • ctags: 8,762
  • sloc: ansic: 76,755; sh: 43,148; perl: 18,864; tcl: 16,366; python: 2,820; makefile: 1,889; lisp: 1,793; asm: 220
file content (20 lines) | stat: -rw-r--r-- 443 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
 
#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H

int merge_recursive(struct commit *h1,
		    struct commit *h2,
		    const char *branch1,
		    const char *branch2,
		    struct commit_list *ancestors,
		    struct commit **result);

int merge_trees(struct tree *head,
		struct tree *merge,
		struct tree *common,
		const char *branch1,
		const char *branch2,
		struct tree **result);

struct tree *write_tree_from_memory(void);

#endif