diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 07:47:47 +0400 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-28 01:18:29 +0400 |
| commit | 4ff192d3f224c780c741e62146c3350e54cba759 (patch) | |
| tree | 2bd321725806845dc45d6c00ef5c96f0c6715cc6 /src/merge.h | |
| parent | 839c5f574f40726f6fbdb82c947635bd14bdc9aa (diff) | |
Move merge functions to merge.c
In so doing, promote commit_list to git_commit_list,
with its own internal API header.
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index 2117d9214..3681e24b7 100644 --- a/src/merge.h +++ b/src/merge.h @@ -8,6 +8,8 @@ #define INCLUDE_merge_h__ #include "git2/types.h" +#include "git2/merge.h" +#include "commit_list.h" #define GIT_MERGE_MSG_FILE "MERGE_MSG" #define GIT_MERGE_MODE_FILE "MERGE_MODE" @@ -15,5 +17,6 @@ #define MERGE_CONFIG_FILE_MODE 0666 int git_merge__cleanup(git_repository *repo); +int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos); #endif |