Add basic regression tests for incoming delete conflict resolver options.
Add basic regression tests for incoming delete conflict resolver options.

This covers "incoming deleted file upon merge". We should eventually add
regression tests for cases involving update/switch, directories, etc.

* subversion/tests/libsvn_client/conflicts-test.c
  (deleted_file_name): New global variable.
  (create_wc_with_incoming_delete_merge_conflict): New helper function.
  (test_option_merge_incoming_delete_ignore,
   test_option_merge_incoming_delete_accept): New tests.
  (test_funcs): Add new tests.


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

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