Author: stsp
Date: Sat Jun 27 09:08:58 2015
New Revision: 1687891
URL: http://svn.apache.org/r1687891
Log:
* subversion/libsvn_client/resolved.c
(tree_conflict_options): Fix description for '--acccept working'.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1687891&r1=1687890&r2=1687891&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jun 27 09:08:58
2015
@@ -463,7 +463,7 @@ static const svn_client_conflict_option_
/* ### Use 'working text' for now since libsvn_wc does not know another
* ### choice to resolve to working yet. */
svn_client_conflict_option_working_text,
- N_("accept working copy version of entire property value"),
+ N_("accept current working copy state"),
NULL,
resolve_tree_conflict
},
