merge-tree: lose unused "flags" from merge_list
Drop the unused field from the structure. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 6, 2012 at 15:41 UTC
b13112fa160f44fb0d795cdd992015c9f5a3d72a
1 file changed
+1
-2
builtin/merge-tree.c
+1
-2
@@ -12,8 +12,7 @@ struct merge_list {
12
struct merge_list *next;
13
struct merge_list *link; /* other stages for this object */
14
15
- unsigned int stage : 2,
16
- flags : 30;
15
+ unsigned int stage : 2;
16
unsigned int mode;
17
const char *path;
18
struct blob *blob;