subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1387597 - /subversion/trunk/subversion/svn/file-merge.c
Date Wed, 19 Sep 2012 13:59:16 GMT
Author: stsp
Date: Wed Sep 19 13:59:15 2012
New Revision: 1387597

URL: http://svn.apache.org/viewvc?rev=1387597&view=rev
Log:
* subversion/svn/file-merge.c
  (merge_chunks): Use a colon to terminate the "Conflicting section found
   during merge" message, instead of a full stop.

Modified:
    subversion/trunk/subversion/svn/file-merge.c

Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1387597&r1=1387596&r2=1387597&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Wed Sep 19 13:59:15 2012
@@ -596,7 +596,7 @@ merge_chunks(apr_array_header_t **merged
 
   prompt = svn_stringbuf_create(
              apr_psprintf(scratch_pool, "%s\n%s|%s\n%s",
-                          _("Conflicting section found during merge."),
+                          _("Conflicting section found during merge:"),
                           prepare_line_for_display(
                             apr_psprintf(scratch_pool,
                                          _("(1) their version (at line %lu)"),



Mime
View raw message