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/10/18 15:31:49 UTC
svn commit: r1399661 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Oct 18 13:31:48 2012
New Revision: 1399661
URL: http://svn.apache.org/viewvc?rev=1399661&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(svn_cl__conflict_func_interactive): Append missing whitespace to a prompt.
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=1399661&r1=1399660&r2=1399661&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Oct 18 13:31:48 2012
@@ -804,7 +804,7 @@ svn_cl__conflict_func_interactive(svn_wc
desc->local_abspath,
subpool)));
prompt = _("Select: (p) postpone, (mf) mine-full, "
- "(tf) theirs-full, (h) help:");
+ "(tf) theirs-full, (h) help: ");
while (1)
{