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/07/08 13:50:32 UTC
svn commit: r1751911 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Fri Jul 8 13:50:32 2016
New Revision: 1751911
URL: http://svn.apache.org/viewvc?rev=1751911&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_local_dir_node_change): Remove unnecessary line wrap.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1751911&r1=1751910&r2=1751911&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Jul 8 13:50:32 2016
@@ -947,8 +947,7 @@ describe_local_dir_node_change(const cha
case svn_wc_conflict_reason_missing:
if (operation == svn_wc_operation_update ||
operation == svn_wc_operation_switch)
- *description = _("No such directory was found in the working "
- "copy.");
+ *description = _("No such directory was found in the working copy.");
else if (operation == svn_wc_operation_merge)
{
/* ### display deleted revision */