From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Dec 2012 23:41:04 +0000 (-0800)
Subject: merge-tree: lose unused "flags" from merge_list
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b13112fa160f44fb0d795cdd992015c9f5a3d72a;p=git.git

merge-tree: lose unused "flags" from merge_list

Drop the unused field from the structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ebd0d25db..b61d81115 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -12,8 +12,7 @@ struct merge_list {
 	struct merge_list *next;
 	struct merge_list *link;	/* other stages for this object */
 
-	unsigned int stage : 2,
-		     flags : 30;
+	unsigned int stage : 2;
 	unsigned int mode;
 	const char *path;
 	struct blob *blob;