* subversion/tests/cmdline/log_tests.py   (test_list): Skip merge-sensitive log tests unless the server knows    what to do with it.
* subversion/tests/cmdline/log_tests.py
  (test_list): Skip merge-sensitive log tests unless the server knows
   what to do with it.


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

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