Date: Tue Jan 27 23:56:00 2004 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv8437 Added Files: merge.test Log Message: New test to make sure that merging files from multiple directories continues to work. Revisions: merge.test NONE => 1.1 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?rev=1.1