Tweak the option descriptions shown by the 'help' option of the interactive
conflict prompt, for the case where there was a tree-conflict with a local
move during update/switch.

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_moved_away): New option menu for update-move
   conflicts, explaining the effect of the possible options more clearly than
   the standard tree-conflicts menu does.
  (handle_tree_conflict): Display the new update-move menu if appropriate.


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