Fix the expected_output and expected_status trees of the  merge_dir_and_file_replace test. 
Fix the expected_output and expected_status trees of the 
merge_dir_and_file_replace test. 

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): test fixes.

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