diff options
Diffstat (limited to 'commit-reach.h')
| -rw-r--r-- | commit-reach.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/commit-reach.h b/commit-reach.h index 458043f4d5..bf63cc468f 100644 --- a/commit-reach.h +++ b/commit-reach.h @@ -18,9 +18,10 @@ int repo_get_merge_bases_many(struct repository *r, struct commit **twos, struct commit_list **result); /* To be used only when object flags after this call no longer matter */ -struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r, - struct commit *one, int n, - struct commit **twos); +int repo_get_merge_bases_many_dirty(struct repository *r, + struct commit *one, int n, + struct commit **twos, + struct commit_list **result); int get_octopus_merge_bases(struct commit_list *in, struct commit_list **result); |