Changed the syntax that specifies a merge file. It is now this:
authorWayne Davison <wayned@samba.org>
Sat, 15 Jan 2005 06:21:03 +0000 (06:21 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 15 Jan 2005 06:21:03 +0000 (06:21 +0000)
commit2e0647758867faa0d3dc8aff28a4b4c72a711aaf
treee4cdf387f57d80b82ac5e2f87afe20a80d036455
parentdc800efa0111e28d8e28395c70151062ec51e0a6
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
filter.diff