Refactor svn_client_conflict_text_get_resolution_options() and svn_client_conflict_prop_get_resolution_options().
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.


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

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