Code clarity fix.
Code clarity fix.

* subversion/libsvn_client/merge.c
  (get_diff_summary_func_cb): Declare and assign in one line.
  (discover_and_merge_children): Remove extraneous variable
   'deleted_subtrees', using 'sb.deleted_paths' instead.

Suggested by: dlr

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion