subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1730945 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Wed, 17 Feb 2016 21:06:38 GMT
Author: stsp
Date: Wed Feb 17 21:06:37 2016
New Revision: 1730945

URL: http://svn.apache.org/viewvc?rev=1730945&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_tree_update_break_moved_away,
   svn_wc__conflict_tree_update_raise_moved_away): Fix indentation.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1730945&r1=1730944&r2=1730945&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Feb 17 21:06:37 2016
@@ -3431,14 +3431,14 @@ svn_wc__conflict_tree_update_break_moved
                              _("Unexpected conflict operation '%s' on '%s'"),
                              svn_token__to_word(operation_map, operation),
                              svn_dirent_local_style(local_abspath,
-                                                     scratch_pool));
+                                                    scratch_pool));
   if (reason != svn_wc_conflict_reason_deleted &&
       reason != svn_wc_conflict_reason_replaced)
     return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                              _("Unexpected conflict reason '%s' on '%s'"),
                              svn_token__to_word(reason_map, reason),
                              svn_dirent_local_style(local_abspath,
-                                                     scratch_pool));
+                                                    scratch_pool));
 
   /* Break moves for any children moved out of this directory,
    * and leave this directory deleted. */
@@ -3516,14 +3516,14 @@ svn_wc__conflict_tree_update_raise_moved
                              _("Unexpected conflict operation '%s' on '%s'"),
                              svn_token__to_word(operation_map, operation),
                              svn_dirent_local_style(local_abspath,
-                                                     scratch_pool));
+                                                    scratch_pool));
   if (reason != svn_wc_conflict_reason_deleted &&
       reason != svn_wc_conflict_reason_replaced)
     return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                              _("Unexpected conflict reason '%s' on '%s'"),
                              svn_token__to_word(reason_map, reason),
                              svn_dirent_local_style(local_abspath,
-                                                     scratch_pool));
+                                                    scratch_pool));
   if (action != svn_wc_conflict_action_edit)
     return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                              _("Unexpected conflict action '%s' on '%s'"),



Mime
View raw message