CVS update: rsync/patches

[Wayne Davison]

Date:	Sun May 30 22:50:43 2004
Author:	wayned

Update of /data/cvs/rsync/patches
In directory dp.samba.org:/tmp/cvs-serv8497

Modified Files:
	merge-exclude-file.diff 
Log Message:
Made inheritance of parent-dir rules optional.


Revisions:
merge-exclude-file.diff		1.17 => 1.18
	http://www.samba.org/cgi-bin/cvsweb/rsync/patches/merge-exclude-file.diff.diff?r1=1.17&r2=1.18