add_merge_entry   196 builtin/merge-tree.c 	add_merge_entry(final);
add_merge_entry   275 builtin/merge-tree.c 	add_merge_entry(entry);