core-tutorial: Catch up with current Git

diff --git a/cache.h b/cache.h
index e0abcd697ce54853bbf4545d20a4ae88a95b533a..27485d36c2f56b6832f96e68ca8cbc7ffad0b957 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -493,6 +493,7 @@ struct ref {
        unsigned char old_sha1[20];
        unsigned char new_sha1[20];
        unsigned char force;
+       unsigned char merge;
        struct ref *peer_ref; /* when renaming */
        char name[FLEX_ARRAY]; /* more */
 };