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 16:20:00 UTC
svn commit: r1736336 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Wed Mar 23 15:19:59 2016
New Revision: 1736336
URL: http://svn.apache.org/viewvc?rev=1736336&view=rev
Log:
* subversion/libsvn_client/conflicts.c
(describe_incoming_add_upon_merge): Fix typo in description string.
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=1736336&r1=1736335&r2=1736336&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Mar 23 15:19:59 2016
@@ -2489,7 +2489,7 @@ describe_incoming_add_upon_merge(
details->added_rev_author, details->added_rev);
else
return apr_psprintf(result_pool,
- _("directory appeared during merge of\n"
+ _("Directory appeared during merge of\n"
"'^/%s:%ld-%ld'.\nIt was added by %s in r%ld."),
new_repos_relpath, old_rev + 1, new_rev,
details->added_rev_author, details->added_rev);