You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/03/19 11:29:53 UTC
svn commit: r1667693 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Mar 19 10:29:53 2015
New Revision: 1667693
URL: http://svn.apache.org/r1667693
Log:
* subversion/svn/conflict-callbacks.c
(text_conflict_options): Indicate the --accept option which corresponds to
the 'r' option, as already done for other options.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1667693&r1=1667692&r2=1667693&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Mar 19 10:29:53 2015
@@ -422,7 +422,7 @@ static const resolver_option_t text_conf
svn_wc_conflict_choose_undefined },
{ "df", N_("show diff"), N_("show all changes made to merged file"),
svn_wc_conflict_choose_undefined },
- { "r", N_("mark resolved"), N_("accept merged version of file"),
+ { "r", N_("mark resolved"), N_("accept merged version of file [working]"),
svn_wc_conflict_choose_merged },
{ "", "", "", svn_wc_conflict_choose_unspecified },
{ "dc", N_("display conflict"), N_("show all conflicts "