Checkout
stsp
committed
on 12 Oct 16
Remove an unnecessary and unused output parameter from a helper function.

* subversion/libsvn_client/conflicts.c
(merge_newly_added_dir):… Show more
Remove an unnecessary and unused output parameter from a helper function.

* subversion/libsvn_client/conflicts.c

 (merge_newly_added_dir): Remove the 'conflict_report' output argument.

 (resolve_merge_incoming_added_dir_merge): Update caller.

Show less