subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1757757 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Thu, 25 Aug 2016 21:46:19 GMT
Author: ivan
Date: Thu Aug 25 21:46:19 2016
New Revision: 1757757

URL: http://svn.apache.org/viewvc?rev=1757757&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_postpone): Fix indentation.

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=1757757&r1=1757756&r2=1757757&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 25 21:46:19 2016
@@ -4533,8 +4533,8 @@ svn_client_conflict_option_set_merged_pr
 /* Implements conflict_option_resolve_func_t. */
 static svn_error_t *
 resolve_postpone(svn_client_conflict_option_t *option,
-                      svn_client_conflict_t *conflict,
-                      apr_pool_t *scratch_pool)
+                 svn_client_conflict_t *conflict,
+                 apr_pool_t *scratch_pool)
 {
   return SVN_NO_ERROR; /* Nothing to do. */
 }



Mime
View raw message