diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 22:47:39 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:08 -0700 |
| commit | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (patch) | |
| tree | 350898e99181e7b2c7d6db4da667d384ef90ef49 /src/merge.h | |
| parent | 02105a27f01509ce4e641487cae040662ee477a2 (diff) | |
| download | libgit2-5aa2ac6de1622308884fd542f7b29e6810a0e98e.tar.gz | |
Update git_merge_tree_opts to git_merge_options
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 1bd202096..44c808dfa 100644 --- a/src/merge.h +++ b/src/merge.h @@ -147,7 +147,7 @@ int git_merge_diff_list__find_differences(git_merge_diff_list *merge_diff_list, const git_tree *ours_tree, const git_tree *theirs_tree); -int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_tree_opts *opts); +int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list *merge_diff_list, const git_merge_options *opts); void git_merge_diff_list__free(git_merge_diff_list *diff_list); |