merge-tree: lose unused "flags" from merge_list
[git] / merge-blobs.c
2012-12-10  Junio C HamanoWhich merge_file() function do you mean?