$OpenBSD: patch-core_git-access_c,v 1.1 2020/11/07 14:54:11 jasper Exp $

https://github.com/subsurface/subsurface/commit/67a717dc057a5936ae1f5820fc6c470524213b97

Index: core/git-access.c
--- core/git-access.c.orig
+++ core/git-access.c
@@ -356,11 +356,7 @@ static int try_to_git_merge(git_repository *repo, git_
 	}
 
 	git_merge_init_options(&merge_options, GIT_MERGE_OPTIONS_VERSION);
-#if !LIBGIT2_VER_MAJOR && LIBGIT2_VER_MINOR > 23
 	merge_options.flags = GIT_MERGE_FIND_RENAMES;
-#else
-	merge_options.tree_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)) {
