* subversion/tests/libsvn_client/conflicts-test.c   (test_merge_incoming_move_dir3): Adjust test expectations to make this PASS.   (test_funcs): Remove XFAIL marker.
* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_move_dir3): Adjust test expectations to make this PASS.
  (test_funcs): Remove XFAIL marker.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion