Allow moved-away nodes shadowed by a replacing layer to be updated or broken
by the conflict resolver.

* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Allow resolving 'incoming edit vs. local
   replace' in the same manner as 'incoming edit vs. local delete'.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1449785 13f79535-47bb-0310-9956-ffa450edef68
Show a special conflict prompt menu for tree conflicts with local replacements.

* subversion/svn/conflict-callbacks.c
  (tree_conflict_options_update_replaced): New. Doesn't differ from the
   corresponding menu used with local deletions, expect for some wording.
  (handle_tree_conflict): Use the new options menu.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1449786 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Remove redundant parentheses.


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