Tweak test for issue #3707 'property conflicts not handled correctly by svn resolve' so it fails due to issue #3707.
Tweak test for issue #3707 'property conflicts not handled correctly by svn
resolve' so it fails due to issue #3707.

* subversion/tests/cmdline/resolve_tests.py

  (prop_conflict_resolution): When this test was written a prop edit
   incoming on an identical local prop edit was a conflict.  That is no
   longer the case, so don't expect it.  This test *still* fails; this is
   simply a cleanup so it no longer fails for reasons unrelated to
   issue #3707.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion