unpack-trees: let merged_entry() pass through do_add_entry()'s errors