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 2012/05/12 15:26:50 UTC
svn commit: r1337537 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Sat May 12 13:26:50 2012
New Revision: 1337537
URL: http://svn.apache.org/viewvc?rev=1337537&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_handler): Make the text-conflict prompt indicate clearly
that the conflict is in a file. Avoids potential confusion of text with
tree conflict prompts.
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=1337537&r1=1337536&r2=1337537&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Sat May 12 13:26:50 2012
@@ -418,7 +418,7 @@ svn_cl__conflict_handler(svn_wc_conflict
if (desc->kind == svn_wc_conflict_kind_text)
SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
- _("Conflict discovered in '%s'.\n"),
+ _("Conflict discovered in file '%s'.\n"),
svn_cl__local_style_skip_ancestor(
b->path_prefix, desc->local_abspath,
subpool)));