Squirrel the 'ignore_ancestry' boolean away in the merge context baton.
Squirrel the 'ignore_ancestry' boolean away in the merge context baton.

* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): Add 'ignore_ancestry' field.
  (svn_client_merge_peg3, svn_client_merge3): Toss 'ignore_ancestry'
    parameter into the merge context baton.
  (drive_merge_report_editor, do_merge, do_single_file_merge): Lose
    'ignore_ancestry' parameter, and just get that value from
    the merge_cmd_baton_t.

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