Fix Windows test breakage caused by r1202665.
Fix Windows test breakage caused by r1202665.

* subversion/tests/cmdline/merge_tests.py
  (expected_merge_output): Correct the doc string.
  (svn_merge): Don't regex-escape the filename passed in a pseudo-regex to
    expected_merge_output().

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