Date: Wed Jan 28 00:37:55 2004 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv15915/testsuite Modified Files: merge.test Log Message: Got rid of indeterminacy in the overlapping-files. Revisions: merge.test 1.1 => 1.2 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test.diff?r1=1.1&r2=1.2