Date: Sun Feb 13 22:48:35 2005 Author: wayned Update of /data/cvs/rsync/testsuite In directory dp.samba.org:/tmp/cvs-serv28499/testsuite Modified Files: merge.test Log Message: The dir vs non-dir test now assumes the dir wins. Revisions: merge.test 1.8 => 1.9 http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/merge.test?r1=1.8&r2=1.9