Checkout
kotkov
committed
on 12 Oct 16
Inline the function that's only used at a single calling site.

* subversion/libsvn_client/conflicts.c
(merge_incoming_added_file_replace)… Show more
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.

Show less