CVS update: rsync/testsuite

[Wayne Davison]

Date:	Mon Mar 12 04:56:15 2007
Author:	wayned

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

Modified Files:
	merge.test 
Log Message:
It looks like some of the compile-farm hosts are hanging on this test,
so let's try some remote-diagnostics (let's try protocol 29 first).


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