Fix a bug where the conflict resolver ignored the merged value provided by the conflict resolution callback, for both text and property conflicts.
Fix a bug where the conflict resolver ignored the merged value provided
by the conflict resolution callback, for both text and property conflicts.

* subversion/libsvn_wc/conflicts.c
  (resolve_text_conflict_on_node): Add 'merged_file' parameter. Use the merged
    file as resolution source if it was provided and the user picked the
    'choose_merged' conflict choice.
  (resolve_prop_conflict_on_node): As above, but here we also need to add a
   'conflicted_propname' parameter which indicates which conflicted property
   the user is resolving, so we can apply the merged value to it.
  (svn_wc__mark_resolved_text_conflict,
   svn_wc__mark_resolved_prop_conflicts): Make these callers pass values for
   the new parameters such that no change in behaviour occurs.
  (conflict_status_walker): Pass the merged_file from the conflict callback
   result to resolve_text_conflict_on_node()/resolve_prop_conflict_on_node().
   This function still ignores the 'save_merge' boolean provided by the
   conflict callback, which will need to be fixed later.


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

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