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().

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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion