diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 22:47:39 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:08 -0700 |
| commit | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (patch) | |
| tree | 350898e99181e7b2c7d6db4da667d384ef90ef49 /tests/merge/merge_helpers.c | |
| parent | 02105a27f01509ce4e641487cae040662ee477a2 (diff) | |
| download | libgit2-5aa2ac6de1622308884fd542f7b29e6810a0e98e.tar.gz | |
Update git_merge_tree_opts to git_merge_options
Diffstat (limited to 'tests/merge/merge_helpers.c')
| -rw-r--r-- | tests/merge/merge_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index e3c2b9e4a..53a0e7b4d 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -10,7 +10,7 @@ int merge_trees_from_branches( git_index **index, git_repository *repo, const char *ours_name, const char *theirs_name, - git_merge_tree_opts *opts) + git_merge_options *opts) { git_commit *our_commit, *their_commit, *ancestor_commit = NULL; git_tree *our_tree, *their_tree, *ancestor_tree = NULL; @@ -55,7 +55,7 @@ int merge_trees_from_branches( int merge_commits_from_branches( git_index **index, git_repository *repo, const char *ours_name, const char *theirs_name, - git_merge_tree_opts *opts) + git_merge_options *opts) { git_commit *our_commit, *their_commit; git_oid our_oid, their_oid; @@ -81,7 +81,7 @@ int merge_commits_from_branches( int merge_branches(git_merge_result **result, git_repository *repo, const char *ours_branch, const char *theirs_branch, - git_merge_tree_opts *merge_opts, git_checkout_options *checkout_opts) + git_merge_options *merge_opts, git_checkout_options *checkout_opts) { git_reference *head_ref, *theirs_ref; git_merge_head *theirs_head; |