Date: Tue Dec 14 19:41:19 2004 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv31351 Modified Files: merge.test Log Message: Got rid of the rare failure caused by a directory-time mismatch. Revisions: merge.test 1.6 => 1.7 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.6&r2=1.7