Tidy up the interactive conflict prompt menus for tree conflicts a bit.

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options): By default, we can only offer resolution to
   the 'working' state, so remove 'mine-conflict' and 'theirs-conflict'
   from the default tree conflict option menu.
  (tree_conflict_options_update_moved_away): Offer 'resolved' instead of
   'theirs-conflict', since 'resolved' is usually the same as '--accept
   working', and because 'theirs-conflict' isn't a valid choice anymore
   at the API level as of r1449761. Tweak option descriptions to better
   explain the effects of the 'mine-conflict' and 'resolved' options.
  (tree_conflict_options_update_deleted): New option menu for tree conflicts
   involving incoming deletions during updates. This could be improved since
   it mentions local moves even if no local moves exist, but it makes careful
   use of the word "any" to accommodate for that.
  (handle_tree_conflict): Print new menu for tree-conflicts involving incoming
   deletions during updates.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1449764 13f79535-47bb-0310-9956-ffa450edef68