* subversion/tests/clients/cmdline/merge_tests.py   (test_list): Don't run `merge_one_file' for now.  It's only      XFailing for me, and that may be due to an Apache setup      problem.  Need to investigate further before either making it a      PASS or changing the test.
* subversion/tests/clients/cmdline/merge_tests.py
  (test_list): Don't run `merge_one_file' for now.  It's only
     XFailing for me, and that may be due to an Apache setup
     problem.  Need to investigate further before either making it a
     PASS or changing the test.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion