svnmerge: Revert r22575, which wasn't quite right.
svnmerge: Revert r22575, which wasn't quite right.

* contrib/client-side/svnmerge_test.py
  (TestCase_TestRepo.testMergeWithPotentialPropertyConflict):
   Remove temporarily.


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

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