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.


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

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