Revision 1751275

In preparation for handling 'add vs add' tree conflicts during update,
rename some symbols in the resolver code to make nomenclature more generic.

* subversion/include/svn_client.h
  (svn_client_conflict_option_merge_incoming_added_file_text_merge,
   svn_client_conflict_option_merge_incoming_added_file_replace,
   svn_client_conflict_option_merge_incoming_added_file_replace_and_merge,
   svn_client_conflict_option_merge_incoming_added_dir_merge,
   svn_client_conflict_option_merge_incoming_added_dir_replace,
   svn_client_conflict_option_merge_incoming_added_dir_replace_and_merge):
    Remove _merge_ from symbol names.
  (svn_client_conflict_option_incoming_added_file_text_merge,
   svn_client_conflict_option_incoming_added_file_replace,
   svn_client_conflict_option_incoming_added_file_replace_and_merge,
   svn_client_conflict_option_incoming_added_dir_merge,
   svn_client_conflict_option_incoming_added_dir_replace,
   svn_client_conflict_option_incoming_added_dir_replace_and_merge): New names.

* subversion/libsvn_client/conflicts.c
  (configure_option_merge_incoming_add_ignore,
   configure_option_merge_incoming_added_file_text_merge,
   configure_option_merge_incoming_added_file_replace,
   configure_option_merge_incoming_added_file_replace_and_merge,
   configure_option_merge_incoming_added_dir_merge,
   configure_option_merge_incoming_added_dir_replace,
   configure_option_merge_incoming_added_dir_replace_and_merge):
    Remove _merge_ from symbol names. Track renamed symbols.
  (configure_option_incoming_add_ignore,
   configure_option_incoming_added_file_text_merge,
   configure_option_incoming_added_file_replace,
   configure_option_incoming_added_file_replace_and_merge,
   configure_option_incoming_added_dir_merge,
   configure_option_incoming_added_dir_replace,
   configure_option_incoming_added_dir_replace_and_merge): New names.
  (svn_client_conflict_tree_get_resolution_options): Track renames.

* subversion/svn/conflict-callbacks.c
  (builtin_resolver_options): Track renames.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_added_file_text_merge,
   test_merge_incoming_added_file_replace,
   test_merge_incoming_added_file_replace_and_merge,
   test_merge_incoming_added_dir_merge,
   test_merge_incoming_added_dir_merge2,
   test_merge_incoming_added_dir_merge3,
   test_merge_incoming_added_dir_replace,
   test_merge_incoming_added_dir_replace_and_merge,
   test_merge_incoming_added_dir_replace_and_merge2): Track renames.