Changed the syntax that specifies a merge file. It is now this:
[rsync-patches.git] / .cvsignore
2004-07-04 Wayne DavisonIgnore "tmp".