From b13112fa160f44fb0d795cdd992015c9f5a3d72a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 6 Dec 2012 15:41:04 -0800 Subject: [PATCH] merge-tree: lose unused "flags" from merge_list Drop the unused field from the structure. Signed-off-by: Junio C Hamano --- builtin/merge-tree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index ebd0d25db6..b61d811158 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; -- 2.11.4.GIT