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 2012/07/06 13:11:36 UTC
svn commit: r1358122 - /subversion/trunk/subversion/svn/file-merge.c
Author: stsp
Date: Fri Jul 6 11:11:35 2012
New Revision: 1358122
URL: http://svn.apache.org/viewvc?rev=1358122&view=rev
Log:
* subversion/svn/file-merge.c
(LINE_DISPLAY_WIDTH): Increase to fill 78 columns.
(SEP_STRING): Adjust to match above change.
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=1358122&r1=1358121&r2=1358122&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul 6 11:11:35 2012
@@ -275,7 +275,7 @@ read_diff_chunk(apr_array_header_t **lin
}
/* ### make this configurable? */
-#define LINE_DISPLAY_WIDTH ((80 / 2) - 4)
+#define LINE_DISPLAY_WIDTH ((80 / 2) - 2)
/* Prepare LINE for display, pruning or extending it to LINE_DISPLAY_WIDTH
* characters, and stripping the EOL marker, if any.
@@ -464,7 +464,7 @@ edit_chunk(apr_array_header_t **merged_c
}
#define SEP_STRING \
- "------------------------------------+------------------------------------\n"
+ "--------------------------------------+--------------------------------------\n"
/* Merge chunks CHUNK1 and CHUNK2.
* Each lines array contains elements of type svn_stringbuf_t*.