Revision 02893a8503158823e42ca1d4d59faae691684b54 authored by Junio C Hamano on 02 November 2008, 22:35:41 UTC, committed by Junio C Hamano on 02 November 2008, 22:35:41 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f6276b7
merge-recursive.h
#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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...