* subversion/include/svn_client.h,
  subversion/libsvn_client/merge.c
  (svn_client_merge4,
   svn_client_merge_peg4,
   svn_client_merge_automatic,
   ...and throughout the implementation...):
    Rename the 'force' parameter to 'force_delete' for clarity.

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