* subversion/tests/libsvn_wc/op-depth-test.c
  (del4_update_delself_AAA): Manually resolve all conflicts to avoid
      a limitation of the currenct conflict resolver.

  (move4_update_delself_AAA): Manually resolve some conflicts until we
      hit the real error.

  (test_funcs): Remove XFail marker from del4_update_delself_AAA.


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