thodg/libgit2

diff --git a/src/merge.c b/src/merge.c
index 54c7660..e2f1e38 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2564,7 +2564,7 @@ done:
 	return error;
 }
 
-int merge_config(git_merge_config_t *out, git_repository *repo)
+static int merge_config(git_merge_config_t *out, git_repository *repo)
 {
 	git_config *config;
 	const char *value;