diff options
author | Edward Thomson <ethomson@microsoft.com> | 2015-02-18 22:53:40 -0500 |
---|---|---|
committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-11 14:11:56 -0400 |
commit | 9ebb5a3ff31a58a25714fbc98704b0fda0982cdb (patch) | |
tree | 0de9c60e6a7cb879ba05870d72fa4be9a464b1ca /src/merge.h | |
parent | bf8dd3f53d25b7f6032b971d3d73931da05982cb (diff) | |
download | libgit2-9ebb5a3ff31a58a25714fbc98704b0fda0982cdb.tar.gz |
merge: merge iterators
Diffstat (limited to 'src/merge.h')
-rw-r--r-- | src/merge.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/merge.h b/src/merge.h index fe4505f8b..3caf617c6 100644 --- a/src/merge.h +++ b/src/merge.h @@ -10,6 +10,7 @@ #include "vector.h" #include "commit_list.h" #include "pool.h" +#include "iterator.h" #include "git2/merge.h" #include "git2/types.h" @@ -121,10 +122,11 @@ int git_merge__bases_many( git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo); -int git_merge_diff_list__find_differences(git_merge_diff_list *merge_diff_list, - const git_tree *ancestor_tree, - const git_tree *ours_tree, - const git_tree *theirs_tree); +int git_merge_diff_list__find_differences( + git_merge_diff_list *merge_diff_list, + git_iterator *ancestor_iterator, + git_iterator *ours_iter, + git_iterator *theirs_iter); int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_options *opts); @@ -138,6 +140,14 @@ int git_merge__setup( const git_annotated_commit *heads[], size_t heads_len); +int git_merge__iterators( + git_index **out, + git_repository *repo, + git_iterator *ancestor_iter, + git_iterator *our_iter, + git_iterator *their_iter, + const git_merge_options *given_opts); + int git_merge__check_result(git_repository *repo, git_index *index_new); int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index); |