You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ha...@apache.org on 2021/12/10 15:11:26 UTC

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

Author: hartmannathan
Date: Fri Dec 10 15:11:26 2021
New Revision: 1895776

URL: http://svn.apache.org/viewvc?rev=1895776&view=rev
Log:
Fix grammar in error string

* subversion/libsvn_client/conflicts.c:
  (resolve_merge_incoming_added_dir_merge): Insert missing "to" in error
   string "Could not determine when '%s' was added to the repository"

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=1895776&r1=1895775&r2=1895776&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Dec 10 15:11:26 2021
@@ -7881,7 +7881,7 @@ resolve_merge_incoming_added_dir_merge(s
       if (details->added_rev == SVN_INVALID_REVNUM)
         return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                                  _("Could not determine when '%s' was "
-                                   "added the repository"),
+                                   "added to the repository"),
                                  svn_dirent_local_style(local_abspath,
                                                         scratch_pool));
       rev1 = rev_below(details->added_rev);