svn commit: r1922331 - in /subversion/branches/apply-processor: ./ subversion/libsvn_client/merge_processor.c

Author: rinrab
Date: Thu Dec  5 18:50:46 2024
New Revision: 1922331

URL: http://svn.apache.org/viewvc?rev=1922331&view=rev
Log:
On the 'apply-processor' branch: Manually merge 1922262 from 'trunk'.
* Minor code format in merge.c.

Modified:
    subversion/branches/apply-processor/   (props changed)
    subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c

Propchange: subversion/branches/apply-processor/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1922266

Modified: subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
URL: http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c?rev=1922331&r1=1922330&r2=1922331&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c (original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c Thu Dec  5 18:50:46 2024
@@ -641,12 +641,12 @@ record_tree_conflict(merge_apply_process
 
   if (!merge_b->dry_run)
     {
-       svn_wc_conflict_description2_t *conflict;
-       const svn_wc_conflict_version_t *left;
-       const svn_wc_conflict_version_t *right;
-       apr_pool_t *result_pool = parent_baton ? parent_baton->pool
-                                              : scratch_pool;
-       svn_client__merge_source_t *source;
+      svn_wc_conflict_description2_t *conflict;
+      const svn_wc_conflict_version_t *left;
+      const svn_wc_conflict_version_t *right;
+      apr_pool_t *result_pool = parent_baton ? parent_baton->pool
+                                            : scratch_pool;
+      svn_client__merge_source_t *source;
 
       if (reason == svn_wc_conflict_reason_deleted)
         {