diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-12 09:43:53 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:09 -0700 |
| commit | d9fdee6e4cb87e4531d9ddba92b44e5323e794da (patch) | |
| tree | d243e3feb5fadcf806e674fd786ff8330ae7d95b /tests/merge/merge_helpers.c | |
| parent | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (diff) | |
| download | libgit2-d9fdee6e4cb87e4531d9ddba92b44e5323e794da.tar.gz | |
Remove `git_merge_result` as it's now unnecessary
Diffstat (limited to 'tests/merge/merge_helpers.c')
| -rw-r--r-- | tests/merge/merge_helpers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 53a0e7b4d..154985f11 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -79,7 +79,7 @@ int merge_commits_from_branches( return 0; } -int merge_branches(git_merge_result **result, git_repository *repo, +int merge_branches(git_repository *repo, const char *ours_branch, const char *theirs_branch, git_merge_options *merge_opts, git_checkout_options *checkout_opts) { @@ -95,7 +95,7 @@ int merge_branches(git_merge_result **result, git_repository *repo, cl_git_pass(git_reference_lookup(&theirs_ref, repo, theirs_branch)); cl_git_pass(git_merge_head_from_ref(&theirs_head, repo, theirs_ref)); - cl_git_pass(git_merge(result, repo, (const git_merge_head **)&theirs_head, 1, merge_opts, checkout_opts)); + cl_git_pass(git_merge(repo, (const git_merge_head **)&theirs_head, 1, merge_opts, checkout_opts)); git_reference_free(head_ref); git_reference_free(theirs_ref); |