Don't create subpools in merge svn_wc_diff_callbacks4_t callbacks when there are already scratch_pools available.
Don't create subpools in merge svn_wc_diff_callbacks4_t callbacks when there
are already scratch_pools available.

Suggested by: rhuijben

* subversion/libsvn_client/merge.c
  (merge_file_changed,
   merge_file_added,
   merge_file_deleted,
   merge_dir_added,
   merge_dir_deleted):


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

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