Add another conflict resolver regression test.
Add another conflict resolver regression test.

This tests an incoming file move vs local edit upon switch.

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_incoming_delete_merge_conflict): Add parameter 'do_switch'.
   If set, this function creates a 'switch' tree conflict, instead of a
   'merge' tree conflict.
  (test_option_merge_incoming_delete_ignore,
   test_option_merge_incoming_delete_accept,
   test_option_merge_incoming_move_file_text_merge): Update callers.
  (test_option_switch_incoming_move_file_text_merge): New test.
  (test_funcs): Add new test.


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

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