Fix a failing test: merge_tests 3.
Fix a failing test: merge_tests 3.

* subversion/tests/cmdline/merge_tests.py
  (delete_file_and_dir): Remove the last part of this test, where it was
    trying to get a merge to delete modified nodes, because we no longer
    want such deletes to go ahead silently and there are separate tests in
    in the realm of tree conflicts to cover this.


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

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