diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 17:58:10 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:06 -0700 |
| commit | 1c0b6a38bacb54de300d936338d4adb04a9b311f (patch) | |
| tree | 8833af717c920b9961fa6e4112bf8909ce60d6e1 /src/merge.h | |
| parent | ccb308273a8662a9692849115a929bd1a74a15f7 (diff) | |
| download | libgit2-1c0b6a38bacb54de300d936338d4adb04a9b311f.tar.gz | |
Remove fastforward / uptodate from `git_merge`
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/merge.h b/src/merge.h index dda023528..1bd202096 100644 --- a/src/merge.h +++ b/src/merge.h @@ -156,9 +156,8 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list); int git_merge__setup( git_repository *repo, const git_merge_head *our_head, - const git_merge_head *their_heads[], - size_t their_heads_len, - unsigned int flags); + const git_merge_head *heads[], + size_t heads_len); int git_merge__indexes(git_repository *repo, git_index *index_new); |