svnmerge: A follow-up to r22577 removing a redundant assertion which crept in.
svnmerge: A follow-up to r22577 removing a redundant assertion which
crept in.

* contrib/client-side/svnmerge_test.py
  (TestCase_TestRepo.testMergeWithPotentialPropertyConflict): Remove
   extra assertion for the precense of "dir_conflicts.prej".


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

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