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 2014/04/24 15:37:18 UTC
svn commit: r1589727 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Thu Apr 24 13:37:17 2014
New Revision: 1589727
URL: http://svn.apache.org/r1589727
Log:
Cosmetic follow-up to r1589718:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Wrap lines for width <= 78.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1589727&r1=1589726&r2=1589727&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Apr 24 13:37:17 2014
@@ -805,8 +805,10 @@ handle_text_conflict(svn_wc_conflict_res
svn_boolean_t remains_in_conflict = TRUE;
svn_error_t *err;
- err = svn_cl__merge_file_externally(desc->base_abspath, desc->their_abspath,
- desc->my_abspath, desc->merged_file,
+ err = svn_cl__merge_file_externally(desc->base_abspath,
+ desc->their_abspath,
+ desc->my_abspath,
+ desc->merged_file,
desc->local_abspath, b->config,
&remains_in_conflict, iterpool);
if (err)