X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=16bdbb259168ff42ad68102bd012751139afa017;hb=e5f4e214636f9c9bd36c2897634108d5ad5587a1;hp=824650016677353cfa8c8a140eb3d904f56d60ee;hpb=9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e;p=git.git

diff --git a/cache.h b/cache.h
index 824650016..16bdbb259 100644
--- a/cache.h
+++ b/cache.h
@@ -492,6 +492,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 */
 };