Following up on r1764435, remove two unused functions.
Following up on r1764435, remove two unused functions.

The merge_incoming_added_file_replace() function is now always called with
'merge_files' set to true, and this code can be simplified, but I'll do it
separately.

* subversion/libsvn_client/conflicts.c
  (resolve_merge_incoming_added_file_replace,
   resolve_update_incoming_added_file_replace): Remove these unused functions.


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

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