subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1358072 - /subversion/trunk/subversion/svn/file-merge.c
Date Fri, 06 Jul 2012 08:28:51 GMT
Author: stsp
Date: Fri Jul  6 08:28:50 2012
New Revision: 1358072

URL: http://svn.apache.org/viewvc?rev=1358072&view=rev
Log:
* subversion/svn/file-merge.c
  (merge_chunks): Cosmetic tweaks: Properly align the separator line
   and indent both left and right version of the chunk in the same way.

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=1358072&r1=1358071&r2=1358072&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul  6 08:28:50 2012
@@ -434,7 +434,7 @@ prepare_line_for_display(const char *lin
 }
 
 #define SEP_STRING \
-  "--------------------------------------+--------------------------------------\n"
+  "-------------------------------------+-------------------------------------\n"
 
 /* Merge chunks CHUNK1 and CHUNK2.
  * Each lines array contains elements of type svn_stringbuf_t*.
@@ -461,7 +461,7 @@ merge_chunks(apr_array_header_t **merged
    */
 
   prompt = svn_stringbuf_create(
-             apr_psprintf(scratch_pool, "%s | %s\n%s",
+             apr_psprintf(scratch_pool, "%s |%s\n%s",
                           prepare_line_for_display(
                             apr_psprintf(scratch_pool,
                                          _("(1) their version (at line %lu)"),
@@ -510,7 +510,7 @@ merge_chunks(apr_array_header_t **merged
       else
         line2 = prepare_line_for_display("", iterpool);
         
-      prompt_line = apr_psprintf(iterpool, "%s | %s\n", line1, line2);
+      prompt_line = apr_psprintf(iterpool, "%s |%s\n", line1, line2);
 
       svn_stringbuf_appendcstr(prompt, prompt_line);
     }



Mime
View raw message