Merge branch 'ph/checkout'

diff --git a/builtin-merge.c b/builtin-merge.c
index 8825dcf8d9c4cce3fa0321a808877237d05d4f5a..e78fa18b3a68e2b7f041beab0524ce1a2b7e9365 100644 (file)
--- 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) &&