Checkout
Stefan Sperling
committed
on 31 Jan 16
* subversion/libsvn_client/resolved.c
(svn_client_conflict_text_get_resolution_options,
(svn_client_conflict_prop_get_resolution_options… Show more
* subversion/libsvn_client/resolved.c

 (svn_client_conflict_text_get_resolution_options,

 (svn_client_conflict_prop_get_resolution_options): Forgot to localize

  descriptions while copying conflict options from static arrays.

Found by: rhuijben

Show less