Checkout
kotkov
committed
on 12 Oct 16
Following up on r1764435, remove two unused functions.

The merge_incoming_added_file_replace() function is now always called with
'merge_fi… Show more
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.

Show less