diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-22 05:55:39 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-22 05:59:35 +0200 |
| commit | 07fb67f90e79ecf35672008fed262a7db41d9790 (patch) | |
| tree | 32379a7389bf089a5da0284e294a7ce3962e8dec /src/merge.c | |
| parent | 92d19d16711c059c768063956abd31db346d2e7b (diff) | |
| download | libgit2-07fb67f90e79ecf35672008fed262a7db41d9790.tar.gz | |
merge: reverse array and length parameter order
Make it pair up with the one for commits. This fixes #1691.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 2e94ce1cd..b07e8c52f 100644 --- a/src/merge.c +++ b/src/merge.c @@ -58,7 +58,7 @@ struct merge_diff_df_data { /* Merge base computation */ -int git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_array[], size_t length) +int git_merge_base_many(git_oid *out, git_repository *repo, size_t length, const git_oid input_array[]) { git_revwalk *walk; git_vector list; |