* subversion/libsvn_client/conflicts.c   (merge_incoming_added_file_replace): Do not use CTX->CANCEL_BATON as    CANCEL_FUNC in call to svn_stream_copy3().
* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_file_replace): Do not use CTX->CANCEL_BATON as
   CANCEL_FUNC in call to svn_stream_copy3().

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

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