update_entry     1357 merge-recursive.c 				update_entry(ren1->dst_entry,
update_entry     1492 merge-recursive.c 				update_entry(ren1->dst_entry, one, a, b);