Separate the two meanings of 'ignore_ancestry' in the libsvn_client merge
APIs. The two new flags are 'ignore_mergeinfo' and 'diff_ignore_ancestry'.

* subversion/include/svn_client.h
  (svn_client_merge5, svn_client_merge_peg5): New, with separate flags.
  (svn_client_merge4, svn_client_merge_peg4): Deprecated.

* subversion/libsvn_client/merge.c
  (svn_client_merge5, svn_client_merge_peg5): New, with separate flags.

* subversion/libsvn_client/deprecated.c
  (svn_client_merge4, svn_client_merge_peg4): Re-implement as wrappers.

* subversion/svn/merge-cmd.c
  (merge_reintegrate, svn_cl__merge): Update callers.


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