Simplify some conflict resolution code in libsvn_wc.

Remove the resolve_conflict_on_node() helper function, which was a thin
wrapper around three other functions for resolving text, prop, and tree
conflicts. Which of the other functions was called could be controlled
by the caller with a set of boolean parameters. Because every caller was
setting only one of these boolean parameters, the case where multiple
wrapped functions are called never occurred. So the abstraction provided
by resolve_conflict_on_node() is not necessary.

Adjust all callers of resolve_conflict_on_node() to call the appropriate
text/prop/tree function directly. This will also make it easier in the future
to add specific functionality to resolution of text, prop, or tree conflicts,
without having to pass data through the resolve_conflict_on_node() wrapper.

No functional change.

* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node,
   resolve_prop_conflict_on_node,
   resolve_tree_conflict_on_node): Merge code from resolve_conflict_on_node()
    into these functions, and adjust their interfaces so that former callers
    of resolve_conflict_on_node() can easily make use of these functions.
  (resolve_conflict_on_node): Remove.
  (svn_wc__mark_resolved_text_conflict,
   svn_wc__mark_resolved_prop_conflicts,
   conflict_status_walker): Switch callers from resolve_conflict_on_node()
    to the more specific functions, as appropriate.


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