Date: Fri May 25 14:32:08 2007 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv18523 Modified Files: merge.test Log Message: Changed verbosity back from -vvvv to -vv. Revisions: merge.test 1.22 => 1.23 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.22&r2=1.23