Extract the code that sends the '--- merging' lines from the notification
wrapper. This removes the last merge behavior dependency from the notification
wrapper framework.

* subversion/libsvn_client/merge.c
  (record_operative_merge_action): Add prototype.
  (record_update_add,
   record_update_update,
   record_update_delete): Call record_operative_merge_action.

  (record_operative_merge_action): Extract this new function from...
  (notification_receiver): ... this function, which now just forwards
    notifications.


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