* subversion/libsvn_client/resolved.c   (svn_client_conflict_prop_get_resolution_options): Ensure that options    returned from here live in writable memory so that option->type_data     can be written to. Should fix access violation on Windows.
* subversion/libsvn_client/resolved.c
  (svn_client_conflict_prop_get_resolution_options): Ensure that options
   returned from here live in writable memory so that option->type_data 
   can be written to. Should fix access violation on Windows.

Found by: svn-windows-local buildbot


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

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