Add conflict resolver regression test for 'incoming move dir merge' option.
Add conflict resolver regression test for 'incoming move dir merge' option.

* subversion/tests/libsvn_client/conflicts-test.c
  (deleted_dir_name, deleted_dir_child): New global constants.
  (new_dir_name): Move definition upwards in the file.
  (create_wc_with_incoming_delete_dir_conflict): New test setup helper.
  (test_merge_incoming_move_dir, test_funcs): New test.


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

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