* subversion/tests/cmdline/merge_tests.py   (merge_in_new_file_and_diff):      Following up on r39680, use '/' as path separator in expected diff      output, to fix this test on Windows.
* subversion/tests/cmdline/merge_tests.py
  (merge_in_new_file_and_diff):
     Following up on r39680, use '/' as path separator in expected diff
     output, to fix this test on Windows.

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