Introduce a private type-specific data section in svn_client_conflict_option_t.
Introduce a private type-specific data section in svn_client_conflict_option_t.

Use this new section to store the property name an property conflict option
applies to, rather than storing the property name in a plain struct member.
More type-specific data will follow.

* subversion/libsvn_client/resolved.c
  (svn_client_conflict_option_t): Introduce a type_data section and move
   'propname' into it.
  (svn_client_conflict_prop_resolve,
   resolve_prop_conflict): Update users of svn_client_conflict_option_t.
  (text_conflict_options, binary_conflict_options, prop_conflict_options,
   tree_conflict_options): Update these static initializers as well.


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

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