CVS update: rsync/testsuite

[Wayne Davison]

Date:	Mon Mar 12 18:05:03 2007
Author:	wayned

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

Modified Files:
	merge.test 
Log Message:
Next step: see if the hang returns with a partial restoration of
protocol 30.


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