Split the large body of the libsvn_wc resolve_conflict_on_node() function
into 3 distinct helper functions (one each for text, prop, and tree conflicts).

Do some minor cleanup while here. No functional change.

* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node, resolve_prop_conflict_on_node,
   resolve_tree_conflict_on_node): New, moved with small changes from...
  (resolve_conflict_on_node): ... this function. Replace all occurrences of
   'pool' with 'scratch_pool', since pool was simply assigned to scratch_pool
   upon entry to this function. Get rid of the work_items parameter and make
   it a local variable instead, since no existing caller was using work items
   returned by this function.
  (svn_wc__mark_resolved_text_conflict,
   svn_wc__mark_resolved_prop_conflicts,
   conflict_status_walker): Update callers of resolve_conflict_on_node().


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