Add another conflict resolver test (XFAIL).
Add another conflict resolver test (XFAIL).

* subversion/tests/libsvn_client/conflicts-test.c
  (test_update_incoming_dir_move_with_nested_file_move, test_funcs): New test.


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

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