Improve the interactive conflict resolution menu for 'incoming dir edit vs.  local dir deletion', and don't show this menu for unrelated conflict cases.
Improve the interactive conflict resolution menu for 'incoming dir edit vs. 
local dir deletion', and don't show this menu for unrelated conflict cases.

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_replaced): Remove, now redundant.
  (tree_conflict_options_update_deleted): Rename to ...
  (tree_conflict_options_update_edit_deleted_dir): ... this, and tweak the
    menu entries and help strings for clarity. Remove the 'r' option from
    this menu because it is usually the wrong choice, and can also be
    reached via 'svn resolve --accept working'.
  (handle_tree_conflict): Tweak logic to only show the above menu for the
   'incoming dir edit' case.


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

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