Following up on r1538639, use svn_wc_conflict_choose_merged to resolve to
the 'not mine state' as that is what the conflict resolver expects.

This fixes one of the tests added in r1538639.

* subversion/tests/libsvn_wc/op-depth-test.c
  (del4_update_edit_AAA,
   del4_update_delete_AAA,
   del4_update_add_AAA,
   del4_update_delself_AAA,
   move4_update_edit_AAA,
   move4_update_delete_AAA,
   move4_update_add_AAA,
   move4_update_delself_AAA): Tweak test.

  (move4_update_edit_AAA): Remove XFail marker.


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