unpack-trees(): carry skip-worktree bit over in merged_entry()