Tweak new merge test to make it run properly on Windows.
Tweak new merge test to make it run properly on Windows.

* subversion/tests/cmdline/merge_tests.py
  (merge_conflict_when_keywords_removed): Don't use hard-coded path
   separators.


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

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