Following the rename of libsvn_client merge 'force' parameters to
'force_delete' in r1435401, change all their callers likewise.

* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
  (Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ): As above.

* subversion/bindings/javahl/native/SVNClient.h,
  subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::merge): Same (in both variants of this function).

* subversion/svn/merge-cmd.c
  (merge_reintegrate, automatic_merge, svn_cl__merge): Same.


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