In the merge code, record deletions directly instead of relying on the
notification handler of the repository diff.

* subversion/libsvn_client/merge.c
  (record_update_delete): New function.
  (merge_file_deleted): Call record_update_delete.
   merge_dir_deleted): Call record_update_delete. Fix conflict notify
     type.
  (notification_receiver): Remove recording.
  (single_file_merge_notify): Record for single file merges.


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