checkout: automerge local changes while switching branches.

diff --git a/object.h b/object.h
index 336d986b51831db7812fd9bbd6a818803935fde2..0e7618283cb8c85d89cc2935b8ab7430571a14a7 100644 (file)
--- a/object.h
+++ b/object.h
@@ -9,7 +9,7 @@ struct object_list {
 
 struct object_refs {
        unsigned count;
-       struct object *ref[0];
+       struct object *ref[FLEX_ARRAY]; /* more */
 };
 
 struct object {