Move resolution logic for update-move conflicts, which was spread across two separate functions, into a single function.
Move resolution logic for update-move conflicts, which was spread across
two separate functions, into a single function.

No functional change intended.

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Add notify_func/notify_baton parameters.
   Handle resolution of all update-move conflicts in this function.
   Rework the logic a bit to clearly group the various resolution cases
   supported for tree conflicts.
   While here, rename the 'cancel_func_t' parameter to 'cancel_func'.
  (svn_wc__mark_resolved_text_conflict,
   svn_wc__mark_resolved_prop_conflicts): Pass NULL notify_func/baton pair
    to resolve_conflict_on_node().
  (conflict_status_walker): Remove support for update-move conflict resolution,
   which has been moved to resolve_conflict_on_node().
   Pass notify_func/baton pair to resolve_conflict_on_node().


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

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