Copy over svnmerge.py's test suite from Giovanni Bajo's Subversion repository that used to be the canonical repository for svnmerge.py. This test suite does fail on the 'testCommitFileDisabled (__main__.TestCase_TestRepo)' test, but I want to copy the file over unmodified.  The next commit will fix this.
Copy over svnmerge.py's test suite from Giovanni Bajo's Subversion
repository that used to be the canonical repository for svnmerge.py.
This test suite does fail on the 'testCommitFileDisabled
(__main__.TestCase_TestRepo)' test, but I want to copy the file over
unmodified.  The next commit will fix this.

* contrib/client-side/test_svnmerge.py:
  New file copied unmodified from revision 236 of
    svn://pyinstaller.hpcf.upr.edu/svnmerge/test_svnmerge.py .
  There are newer revisions of this file in the other repository, but
    those contain changes not ready to be merged into svn.collab.net.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@858633 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion