Remove an access baton from client merge.
Remove an access baton from client merge.

* subversion/libsvn_client/merge.c
  (merge_reintegrate_locked): Renamed from svn_client_merge_reintegrate,
   parameter target_wcpath renamed to target_abspath, parameter pool
   renamed to scratch_pool, remove access baton.
  (struct merge_reintegrate_baton, merge_reintegrate_cb): New
  (svn_client_merge_reintegrate): Gutted, uses svn_wc__call_with_write_lock.

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