Follow-up to r26177, expand criteria for test merge_with_depth_files' PASSing.
Follow-up to r26177, expand criteria for test merge_with_depth_files' PASSing.

* subversion/tests/cmdline/merge_tests.py
  (merge_with_depth_files): Use run_and_verify_merge() rather than
  run_and_verify_svn('merge') and check for expected mergeinfo. 


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

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