Test issue #3250.
Test issue #3250.

* subversion/tests/cmdline/merge_tests.py
  (merge_two_edits_to_same_prop): Extend merge test 107, to include test
   for issue #3250.

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