[PATCH] Be compatible with libgit2 0.22 again

[Anton Lundin]

In libgit2 0.22 tree_flags was called flags.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 git-access.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/git-access.c b/git-access.c
index 388fa27..e09deb6 100644
--- a/git-access.c
+++ b/git-access.c
@@ -195,7 +195,11 @@ static int try_to_git_merge(git_repository *repo, git_reference *local, git_refe
 	}
 
 	git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
+#ifdef USE_LIBGIT23_API
 	merge_options.tree_flags = GIT_MERGE_TREE_FIND_RENAMES;
+#else
+	merge_options.flags = GIT_MERGE_TREE_FIND_RENAMES;
+#endif
 	merge_options.file_favor = GIT_MERGE_FILE_FAVOR_UNION;
 	merge_options.rename_threshold = 100;
 	if (git_commit_lookup(&local_commit, repo, local_id))
-- 
2.1.4