Fix the svnmerge.py test suite to work with the version of svnmerge.py in svn.collab.net.
Fix the svnmerge.py test suite to work with the version of svnmerge.py
in svn.collab.net.

* contrib/client-side/test_svnmerge.py:
  Remove the svn:keywords property, as they mess with the
    TestCase_kwextract.test_basic and the
    TestCase_kwextract.test_failure tests which expect a specific
    value of $Rev$ and $Date$.
  (TestCase_TestRepo.testCommitFileDisabled):
    Remove this test since the svnmerge.py in svn.collab.net will not
    prevent generation of the commit log message file with the -f-
    command line option.  This behavior is enabled in Giovanni Bajo's
    repository, but was not accepted by the community, since -f-
    commonly means, send the output to standard output.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion