Merge branch 'rs/archive'

[git.git] / builtin-merge-recursive.c

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 385e742eefb6f62b58705dfb98a977bdc76ea4d2..652a2c32bb0913108e0435de86392764da3ad611 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -42,14 +42,6 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two)
  * - *(int *)commit->object.sha1 set to the virtual id.
  */
 
-static unsigned commit_list_count(const struct commit_list *l)
-{
-       unsigned c = 0;
-       for (; l; l = l->next )
-               c++;
-       return c;
-}
-
 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
 {
        struct commit *commit = xcalloc(1, sizeof(struct commit));