* subversion/tests/cmdline/resolve_tests.py
  (multi_range_merge_with_accept): New XFail regression test for issue #4238
    'merge -cA,B with --accept option aborts if rA conflicts'.
  (test_list): Run it.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1435310 13f79535-47bb-0310-9956-ffa450edef68