Fix a bug in merge_file_deleted, and remove a constant parameter.
Fix a bug in merge_file_deleted, and remove a constant parameter.

* subversion/libsvn_client/merge.c:
  (merge_file_deleted): fix check/assign of TREE_CONFLICTED
  (drive_merge_report_editor): remove CALLBACKS param and simply pass
    &merge_callbacks to svn_client__get_diff_editor()
  (do_mergeinfo_unaware_dir_merge, do_directory_merge): don't bother to
    pass merge_callbacks to drive_merge_report_editor


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@929786 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion