In the interactive conflict prompt menu, rename 'resolved' options to
'mark resolved'. I hope this better conveys the effect of this option,
which clears conflict markers and leaves the current working copy state as-is.

* subversion/svn/conflict-callbacks.c
  (text_conflict_options, prop_conflict_options, obstructed_add_options,
   tree_conflict_options, tree_conflict_options_update_moved_away,
   tree_conflict_options_update_deleted,
   tree_conflict_options_update_replaced,
   handle_text_conflict): 'resolved' -> 'mark resolved'


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