summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-05-21 09:44:05 -0700
committerEdward Thomson <ethomson@microsoft.com>2014-05-27 20:49:24 -0500
commitde3f851ec49deba7b152c01c53aa329439d1f3f5 (patch)
treed96b7a3bcb4982e88cdd68e48fc06542db294d0c
parent22ab8881787f00eec479e1f148a3846a67c9bcfe (diff)
downloadlibgit2-de3f851ec49deba7b152c01c53aa329439d1f3f5.tar.gz
Staticify `merge_config`
-rw-r--r--src/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c
index 54c7660db..e2f1e388d 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;