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/03/23 15:49:30 UTC

svn commit: r1736330 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: stsp
Date: Wed Mar 23 14:49:30 2016
New Revision: 1736330

URL: http://svn.apache.org/viewvc?rev=1736330&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (describe_local_file_node_change): Fix spelling mistake in a description.

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=1736330&r1=1736329&r2=1736330&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 23 14:49:30 2016
@@ -362,7 +362,7 @@ describe_local_file_node_change(const ch
                            "found in the working copy.");
         else if (operation == svn_wc_operation_merge)
           *description = _("A file which differs from the corresponding "
-                           "File on the merge source branch was found "
+                           "file on the merge source branch was found "
                            "in the working copy.");
         break;
       case svn_wc_conflict_reason_obstructed: