Code refactor: Resolve revision numbers in 'svn_client_merge3' and 'svn_client_merge_peg3' rather than doing the same every time inside 'do_merge'  and 'do_single_file_merge'.
Code refactor:
Resolve revision numbers in 'svn_client_merge3' and 'svn_client_merge_peg3'
rather than doing the same every time inside 'do_merge' 
and 'do_single_file_merge'.

* subversion/libsvn_client/merge.c
  (do_merge, do_single_file_merge, discover_and_merge_children):
   Signature change, to accept 'svn_revnum_t' and 'merge_type'.
  (svn_client_merge3, svn_client_merge_peg3):
   Resolve 'svn_opt_revision_t *' to 'svn_revnum_t' and determine 'merge_type'.
   Pass these 'resolved' revisions and merge_type to do_merge, 
   do_single_file_merge and discover_and_merge_children.

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