Inline the function that's only used at a single calling site.
Inline the function that's only used at a single calling site.

* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_file_replace): Inline this function ...
  (resolve_merge_incoming_added_file_replace_and_merge): ...here.  Since
   the calling site was always calling it with 'merge_files' set to true,
   drop the handling of this argument.


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

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