unpack-trees(): carry skip-worktree bit over in merged_entry()
[git] / t / t9603 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot