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/01/21 14:31:48 UTC
svn commit: r1725944 - /subversion/trunk/subversion/libsvn_client/resolved.c
Author: stsp
Date: Thu Jan 21 13:31:48 2016
New Revision: 1725944
URL: http://svn.apache.org/viewvc?rev=1725944&view=rev
Log:
* subversion/libsvn_client/resolved.c
(text_conflict_options, binary_conflict_options, prop_conflict_options,
tree_conflict_options): Tweak the default description of the 'postpone'
conflict option to better describe what this option implies.
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=1725944&r1=1725943&r2=1725944&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Thu Jan 21 13:31:48 2016
@@ -482,7 +482,7 @@ static const svn_client_conflict_option_
{
{
svn_client_conflict_option_postpone,
- N_("mark the conflict to be resolved later"),
+ N_("skip this conflict and leave it unresolved"),
NULL,
resolve_text_conflict
},
@@ -522,7 +522,7 @@ static const svn_client_conflict_option_
{
{
svn_client_conflict_option_postpone,
- N_("mark the conflict to be resolved later"),
+ N_("skip this conflict and leave it unresolved"),
NULL,
resolve_text_conflict,
},
@@ -548,7 +548,7 @@ static const svn_client_conflict_option_
{
{
svn_client_conflict_option_postpone,
- N_("mark the conflict to be resolved later"),
+ N_("skip this conflict and leave it unresolved"),
NULL,
resolve_prop_conflict
},
@@ -574,7 +574,7 @@ static const svn_client_conflict_option_
{
{
svn_client_conflict_option_postpone,
- N_("mark the conflict to be resolved later"),
+ N_("skip this conflict and leave it unresolved"),
NULL,
resolve_tree_conflict
},