Further tweaks of the merge notification handling towards handling it from the
merge code itself.


* subversion/libsvn_client/merge.c
  (merge_cmd_baton_t): New variable with the current merge range.
  (record_skip): Reinstate the no-skip for record only merges.
  (merge_file_changed): Record property only changes as a node change.
  (record_operative_merge_action): Handle merge headers for single file
    merges.
  (single_file_merge_notify): Disable code when using merge notifications.
    Remove code that was duplicated here.
  (do_file_merge): Don't call single_file_merge_notify when using merge
    notifications as the merge will handle this itself.

* subversion/tests/cmdline/merge_tests.py
  (expected_output): Expect that a tree conflict is not a functional merge.


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