Added a test for the merging of a dir and a non-dir with the same name.
[rsync/rsync.git] / packaging /
drwxr-xr-x   ..
drwxr-xr-x - lsb
drwxr-xr-x - solaris