Simplify code by using svn_stream_open_unique() instead of svn_io_open_unique_file3() + svn_stream_from_aprfile2().
Simplify code by using svn_stream_open_unique() instead of
svn_io_open_unique_file3() + svn_stream_from_aprfile2().

* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_file_replace, resolve_incoming_move_file_text_merge):
   Use svn_stream_open_unique(). Remove now redundant local variables.


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

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