subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1658149 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Sun, 08 Feb 2015 11:08:38 GMT
Author: brane
Date: Sun Feb  8 11:08:38 2015
New Revision: 1658149

URL: http://svn.apache.org/r1658149
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Fix indentation. No functional change.

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=1658149&r1=1658148&r2=1658149&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sun Feb  8 11:08:38 2015
@@ -2845,12 +2845,12 @@ resolve_tree_conflict_on_node(svn_boolea
           else if (conflict_choice == svn_wc_conflict_choose_mine_conflict)
             {
               return svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE,
-                                   NULL,
-                                   _("Tree conflict can only be "
-                                     "resolved to 'working' state; "
-                                     "'%s' is no longer moved"),
-                                   svn_dirent_local_style(local_abspath,
-                                                          scratch_pool));
+                                       NULL,
+                                       _("Tree conflict can only be "
+                                         "resolved to 'working' state; "
+                                         "'%s' is no longer moved"),
+                                       svn_dirent_local_style(local_abspath,
+                                                              scratch_pool));
             }
         }
     }



Mime
View raw message