From 186458b11b090835fa793bcdbf6b5552b053276c Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Thu, 24 Jul 2008 01:09:35 +0200 Subject: Make non-static functions, that may be static, static Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- builtin-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin-merge.c') diff --git a/builtin-merge.c b/builtin-merge.c index 8825dcf8d9..e78fa18b3a 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -431,7 +431,7 @@ static void merge_name(const char *remote, struct strbuf *msg) sha1_to_hex(remote_head->sha1), remote); } -int git_merge_config(const char *k, const char *v, void *cb) +static int git_merge_config(const char *k, const char *v, void *cb) { if (branch && !prefixcmp(k, "branch.") && !prefixcmp(k + 7, branch) && -- cgit v1.2.1