Fix the bidirectional test case in svnmerge_test.py to work with svn 1.2.x as well as 1.3.x since svn 1.2.x does not produce property conflicts, and since the current test code expects it, the test fails.
Fix the bidirectional test case in svnmerge_test.py to work with svn
1.2.x as well as 1.3.x since svn 1.2.x does not produce property
conflicts, and since the current test code expects it, the test fails.

Patch by: Raman Gupta <rocketraman@fastmail.fm>

* contrib/client-side/svnmerge_test.py
  (TestCase_TestRepo.testBidirectionalMerges)
    Remove an assertion on resolved output.


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

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