In the interactive conflict prompt menu, tweak the tree conflict options to better explain the effects of available options.
In the interactive conflict prompt menu, tweak the tree conflict options
to better explain the effects of available options.

Inspired by: ivan
             Danil Shopyrin danil a@t visualsvn.com

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_moved_away): Change option labels for clarity:
    'my side of conflict' -> 'apply update (recommended)'
    'mark resolved' -> 'discard update (breaks move)'
  (tree_conflict_options_update_edit_moved_away): New. Specific menu for
    the case where the incoming change is an edit, rather than an addition,
    a deletion, etc.
  (tree_conflict_options_update_deleted,
   tree_conflict_options_update_replaced): Change option labels for clarity:
    'my side of conflict' -> 'keep affected local moves'   
    'mark resolved' -> 'mark resolved (breaks moves)'
  (handle_tree_conflict): Use the special 'edit_moved_away' menu for conflicts
   involving local moves vs. incoming edits.


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

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