* contrib/client-side/svnmerge.py   (main):     Don't reuse the same options for multiple runs of svnmerge.main()     within the test suite.  Instead, re-initialize our options from a     clean copy of the options dictionary every time svnmerge.main() is     called.
* contrib/client-side/svnmerge.py
  (main):
    Don't reuse the same options for multiple runs of svnmerge.main()
    within the test suite.  Instead, re-initialize our options from a
    clean copy of the options dictionary every time svnmerge.main() is
    called.

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