* subversion/libsvn_client/conflicts.c   (resolve_accept_current_wc_state,    resolve_merge_incoming_added_file_text_merge): Send new notification     action svn_wc_notify_resolved_tree instead of svn_wc_notify_resolved.
* subversion/libsvn_client/conflicts.c
  (resolve_accept_current_wc_state,
   resolve_merge_incoming_added_file_text_merge): Send new notification
    action svn_wc_notify_resolved_tree instead of svn_wc_notify_resolved.


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

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