merge-tree: lose unused "flags" from merge_list

Drop the unused field from the structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-12-06 15:41:04 -08:00
parent fa2364ec34
commit b13112fa16

View File

@ -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;