Expand test for issue #3707 'property conflicts not handled correctly by svn resolve'.
Expand test for issue #3707 'property conflicts not handled correctly by
svn resolve'.

* subversion/tests/cmdline/resolve_tests.py
  (resolving prop conflicts): Also test resolution of a property conflict
   caused by an incoming prop edit on a conflicting local prop modification.


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

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