Added a test for the merging of a dir and a non-dir with the same name.
authorWayne Davison <wayned@samba.org>
Sun, 13 Feb 2005 22:01:15 +0000 (22:01 +0000)
committerWayne Davison <wayned@samba.org>
Sun, 13 Feb 2005 22:01:15 +0000 (22:01 +0000)

No differences found