diff options
Diffstat (limited to 'tests/merge/merge_helpers.h')
| -rw-r--r-- | tests/merge/merge_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h index 71f84467d..fddf8fab1 100644 --- a/tests/merge/merge_helpers.h +++ b/tests/merge/merge_helpers.h @@ -92,7 +92,7 @@ int merge_commits_from_branches( const char *ours_name, const char *theirs_name, git_merge_options *opts); -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); |