CVS update: rsync/patches

[Wayne Davison]

Date:	Sat Jan 15 06:21:04 2005
Author:	wayned

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

Modified Files:
	merge-exclude-file.diff 
Log Message:
Changed the syntax that specifies a merge file.  It is now this:
    -m /path/single-merge.excludes
    +m /path/single-merge.includes
    -p .perdir-merge.excludes
    +p .perdir-merge.includes


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