merge-tree: lose unused "flags" from merge_list
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Dec 2012 23:41:04 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Dec 2012 22:44:47 +0000 (14:44 -0800)
commitb13112fa160f44fb0d795cdd992015c9f5a3d72a
treedbf92a734807c32342703603ea3d7c77826b95fe
parentfa2364ec3457cc107e47d617779f1ffa23647ca4
merge-tree: lose unused "flags" from merge_list

Drop the unused field from the structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-tree.c