Author: breser
Date: Sat Dec 7 05:50:21 2013
New Revision: 1548793
URL: http://svn.apache.org/r1548793
Log:
On 1.8.x: Merge r1470221 from trunk, obvious documentation fix.
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1470221
Modified: subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c?rev=1548793&r1=1548792&r2=1548793&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/1.8.x/subversion/svn/conflict-callbacks.c Sat Dec 7
05:50:21 2013
@@ -489,10 +489,10 @@ static const resolver_option_t text_conf
/* Resolver options for a property conflict */
static const resolver_option_t prop_conflict_options[] =
{
- { "mf", N_("my version"), N_("accept my version of entire file (even "
+ { "mf", N_("my version"), N_("accept my version of entire property
(even "
"non-conflicts) [mine-full]"),
svn_wc_conflict_choose_mine_full },
- { "tf", N_("their version"), N_("accept their version of entire file "
+ { "tf", N_("their version"), N_("accept their version of entire property "
"(same) [theirs-full]"),
svn_wc_conflict_choose_theirs_full },
{ "dc", N_("display conflict"), N_("show conflicts in this property"), -1 },
