Get rid of unnecessary operation in tree conflict resolution.
Get rid of unnecessary operation in tree conflict resolution.

* subversion/libsvn_client/conflicts.c
  (resolve_update_incoming_added_file_replace): Do not remove file before
   moving on top of it. The svn_io_file_rename2() overwrites destination file
   on all platforms.


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

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