1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index e0abcd6..27485d3 100644
--- 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 */
 };