Date: Sun Apr 29 15:01:57 2007 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv28022/testsuite Modified Files: merge.test Log Message: Added a "sleep 1" to make certain failures more reproducible. Revisions: merge.test 1.20 => 1.21 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.20&r2=1.21