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 2016/04/19 11:03:32 UTC
svn commit: r1739873 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Tue Apr 19 09:03:32 2016
New Revision: 1739873
URL: http://svn.apache.org/viewvc?rev=1739873&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(builtin_resolver_options): Add a short description for the option
svn_client_conflict_option_merge_incoming_added_file_text_merge.
Otherwise the prompt will become too cluttered.
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=1739873&r1=1739872&r2=1739873&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Apr 19 09:03:32 2016
@@ -415,7 +415,7 @@ static const resolver_option_t builtin_r
svn_client_conflict_option_update_any_moved_away_children },
/* Options for incoming file add vs local file add upon merge. */
- { "m", NULL, NULL,
+ { "m", N_("merge the files"), NULL,
svn_client_conflict_option_merge_incoming_added_file_text_merge },
{ NULL }