Changed the syntax that specifies a merge file. It is now this:
[rsync-patches.git] / inplace-protocol-bump.diff
2004-11-27 Wayne DavisonFixed failing hunks.
2004-11-12 Wayne DavisonA minor improvement to the variables involved.
2004-11-03 Wayne DavisonMake --inplace work with --compare-dest, and efficient...