builtin/merge.c: drop a parameter that is never used

diff --git a/cache-tree.h b/cache-tree.h
index 55d0f59f2b7a42b40fe4be32297b56656206983d..f1923ad1e9ddd3ad9b77a436e66ad083843094a0 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -30,7 +30,7 @@ void cache_tree_write(struct strbuf *, struct cache_tree *root);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
 int cache_tree_fully_valid(struct cache_tree *);
-int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int);
+int cache_tree_update(struct cache_tree *, const struct cache_entry * const *, int, int);
 
 int update_main_cache_tree(int);