merge-recursive: Cleanup and consolidation of rename_conflict_info

diff --git a/object.h b/object.h
index 4d1d61546f0441bd198cda3ad153b35a91444b72..b6618d92bf04d549350d83b6237770c48734686f 100644 (file)
--- a/object.h
+++ b/object.h
@@ -6,11 +6,6 @@ struct object_list {
        struct object_list *next;
 };
 
-struct object_refs {
-       unsigned count;
-       struct object *ref[FLEX_ARRAY]; /* more */
-};
-
 struct object_array {
        unsigned int nr;
        unsigned int alloc;