Checkout
Ivan Zhakov
committed
on 12 Oct 16
Refactor svn_client_conflict_text_get_resolution_options() and
svn_client_conflict_prop_get_resolution_options().

* subversion/libsvn_clien… Show more
Refactor svn_client_conflict_text_get_resolution_options() and

svn_client_conflict_prop_get_resolution_options().

* subversion/libsvn_client/conflicts.c

 (text_conflict_options, binary_conflict_options, prop_conflict_options):

  Remove.

 (svn_client_conflict_text_get_resolution_options,

  svn_client_conflict_prop_get_resolution_options): Inline the code to add

  conflict resolution options instead of make a copy from

  text_conflict_options/binary_conflict_options/prop_conflict_options arrays.

Show less