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


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@866358 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion