Revision 1762939

In the tree conflict resolver, do not advertise the "ignore incoming
deletion" and "accept incoming deletion" options in the incoming move vs
local file edit situation.

If we know that the incoming delete actually is a move, there are no known
cases when ignoring or accepting the deletion would prove useful.  Apart
from that, offering these options can potentially confuse the users.
("What deletion?  The resolver says the file was moved.")

* subversion/libsvn_client/conflicts.c
  (configure_option_incoming_delete_ignore,
   configure_option_incoming_delete_accept): Do not add these options
   when we know that we're dealing with an incoming move and a local
   edit situation.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_merge_incoming_move_file_text_merge,
   test_update_incoming_move_file_text_merge,
   test_switch_incoming_move_file_text_merge): Test offered options
   before and after receiving the conflict details.