Merge branch 'maint'

diff --git a/merge-recursive.c b/merge-recursive.c
index f5df9b961b2999e4824b900d61d28c254b2ef858..c703445a9cdf66f2933c1ffce636bfe3c11a048c 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -38,7 +38,7 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two)
  * A virtual commit has (const char *)commit->util set to the name.
  */
 
-struct commit *make_virtual_commit(struct tree *tree, const char *comment)
+static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
 {
        struct commit *commit = xcalloc(1, sizeof(struct commit));
        commit->tree = tree;