From 5aa2ac6de1622308884fd542f7b29e6810a0e98e Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 11 Mar 2014 22:47:39 -0700 Subject: Update git_merge_tree_opts to git_merge_options --- src/merge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/merge.h') 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); -- cgit v1.2.1