CVS update: rsync/testsuite

Date:   Sun Feb 13 22:01:15 2005
Author: wayned

Update of /data/cvs/rsync/testsuite
In directory dp.samba.org:/tmp/cvs-serv16671

Modified Files:
        merge.test 
Log Message:
Added a test for the merging of a dir and a non-dir with the same name.


Revisions:
merge.test              1.7 => 1.8
        
http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.7&r2=1.8