Remove the dedicated automatic merge functions from the public API, now that
the functionality is available through svn_client_merge_peg5().

* subversion/include/svn_client.h
  (svn_client_automatic_merge_t,
   svn_client_find_automatic_merge,
   svn_client_find_automatic_merge_no_wc,
   svn_client_do_automatic_merge,
   svn_client_automatic_merge_is_reintegrate_like,
   svn_client_automatic_merge_get_locations): Remove.
  (svn_client_get_merging_summary): New.
  (svn_client_merge): Adjust the doc string.

* subversion/libsvn_client/merge.c
  (automatic_merge_t): New name for 'svn_client_automatic_merge_t'.
  (svn_client_merge_peg5): Adjust...
  (find_automatic_merge): New name for 'svn_client_find_automatic_merge'.
  (find_automatic_merge_no_wc): New name for
    'svn_client_find_automatic_merge_no_wc'.
  (client_find_automatic_merge): New name of 'svn_client_find_automatic_merge'.
  (do_automatic_merge_locked): 
  (svn_client_do_automatic_merge,
   svn_client_automatic_merge_is_reintegrate_like,
   svn_client_automatic_merge_get_locations): Remove.
  (svn_client_get_merging_summary): New.

* subversion/svn/mergeinfo-cmd.c
  (mergeinfo_summary): Adjust to use svn_client_get_merging_summary().


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