svn commit: r1922262 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rinrab
Date: Mon Dec  2 17:08:48 2024
New Revision: 1922262

URL: http://svn.apache.org/viewvc?rev=1922262&view=rev
Log:
Minor code format in merge.c.

* subversion/libsvn_client/merge.c
  (record_tree_conflict): Fix indentation of the variables' declarations.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1922262&r1=1922261&r2=1922262&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Dec  2 17:08:48 2024
@@ -1395,11 +1395,11 @@ record_tree_conflict(merge_cmd_baton_t *
 
   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_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;
 
       if (reason == svn_wc_conflict_reason_deleted)
         {