In the trunk, merge.c: Separate the code for mergeinfo adjustments by

a few newlines.

We have the following structure here:

- Declaration of the local variables related to this scope.
- find_nearest_ancestor_with_intersecting_ranges()
- Initialization of `loc1`, `loc2`, and `source` variables.
- make_conflict_versions(&left, &right)

In general, this scope is existing for proper initialization of `left` and
`right` pointers-to-structure.

* subversion/libsvn_client/merge.c
  (record_tree_conflict): Ditto.

No functional changes.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1922158 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_client/merge.c

@@ -1444,6 +1444,7 @@ record_tree_conflict(merge_cmd_baton_t *merge_b,
             merge_b->children_with_mergeinfo,
             action != svn_wc_conflict_action_delete,
             local_abspath);
+
           loc1 = svn_client__pathrev_dup(merge_b->merge_source.loc1,
                                          scratch_pool);
           loc2 = svn_client__pathrev_dup(merge_b->merge_source.loc2,
@@ -1453,6 +1454,7 @@ record_tree_conflict(merge_cmd_baton_t *merge_b,
           source = svn_client__merge_source_create(loc1, loc2,
                                                    merge_b->merge_source.ancestral,
                                                    scratch_pool);
+
           SVN_ERR(make_conflict_versions(&left, &right, local_abspath,
                                          merge_left_node_kind,
                                          merge_right_node_kind,