Date: Thu Apr 26 23:15:51 2007 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv1113/testsuite Modified Files: merge.test Log Message: Got rid of the --no-ir kluge in this test. Revisions: merge.test 1.19 => 1.20 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.19&r2=1.20