subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From luke1...@apache.org
Subject svn commit: r1769207 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Thu, 10 Nov 2016 22:04:35 GMT
Author: luke1410
Date: Thu Nov 10 22:04:35 2016
New Revision: 1769207

URL: http://svn.apache.org/viewvc?rev=1769207&view=rev
Log:
Following up on r1764902: Corrected indentation.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_text_resolve_by_id): As above.

Found by: kotkov

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1769207&r1=1769206&r2=1769207&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Nov 10 22:04:35 2016
@@ -8952,12 +8952,12 @@ svn_client_conflict_text_resolve_by_id(
     }
 
   if (option == NULL)
-      return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
-                               NULL,
-                               _("Inapplicable conflict resolution option "
-                                 "given for conflicted path '%s'"),
-                               svn_dirent_local_style(conflict->local_abspath,
-                                                      scratch_pool));
+    return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
+                             NULL,
+                             _("Inapplicable conflict resolution option "
+                               "given for conflicted path '%s'"),
+                             svn_dirent_local_style(conflict->local_abspath,
+                                                    scratch_pool));
 
   SVN_ERR(svn_client_conflict_text_resolve(conflict, option, ctx, scratch_pool));
 



Mime
View raw message