CVS update: rsync/testsuite

[Wayne Davison]

Date:	Sun Mar 18 20:41:51 2007
Author:	wayned

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

Modified Files:
	merge.test 
Log Message:
Use relative directories, and note that the merge code is only
working because it is not yet using --inc-recursion.


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