* subversion/libsvn_wc/conflicts.c   (resolve_merge_incoming_added_file_text_merge,    merge_incoming_added_file_replace,    merge_incoming_added_dir_replace,    resolve_incoming_delete_accept): Don't allow libsvn_wc functions to     invoke cancel callbacks. Prevents cancelling resolution mid-way.
* subversion/libsvn_wc/conflicts.c
  (resolve_merge_incoming_added_file_text_merge,
   merge_incoming_added_file_replace,
   merge_incoming_added_dir_replace,
   resolve_incoming_delete_accept): Don't allow libsvn_wc functions to
    invoke cancel callbacks. Prevents cancelling resolution mid-way.


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

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