A merge-replace test (#34) that used to fail now passes, if I bring the expectations up to date.
A merge-replace test (#34) that used to fail now passes, if I bring
the expectations up to date.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): Tweak expectations to match trunk's
   status and commit output.  Remove comments about old errors.
  (test_list): Remove XFail() around the test.

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