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

diff --git a/object.h b/object.h
index 2ff68c52dd48842a188eb8f0c9b1e12ff27fae37..dc5df8ce1d9579a28477f91300aa7a49f37ad4e4 100644 (file)
--- a/object.h
+++ b/object.h
@@ -19,6 +19,7 @@ struct object_array {
                 */
                char *name;
                unsigned mode;
+               struct object_context *context;
        } *objects;
 };
 
@@ -91,6 +92,7 @@ int object_list_contains(struct object_list *list, struct object *obj);
 /* Object array handling .. */
 void add_object_array(struct object *obj, const char *name, struct object_array *array);
 void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode);
+void add_object_array_with_context(struct object *obj, const char *name, struct object_array *array, struct object_context *context);
 
 typedef int (*object_array_each_func_t)(struct object_array_entry *, void *);