Make the merge handling pass a diff processor to the diff driver to allow
slowly switching to a diff tree processor model.

* subversion/libsvn_client/merge.c
  (merge_node_absent): New function. Replacing the intermediate hash table api.
  (drive_merge_report_editor): Accept processor. Remove absent node handling.
    Pass processor to svn_client__get_diff_editor2.

  (do_file_merge): Accept processor.

  (do_mergeinfo_unaware_dir_merge,
   do_mergeinfo_aware_dir_merge,
   do_directory_merge): Forward processor.

  (do_merge): Initialize a processor that drives the old callbacks and the
    new diff processor. Initialize just node_absent support. Update caller.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1440420 13f79535-47bb-0310-9956-ffa450edef68
Implement a 'quit' option in the interactive conflict resolver. It postpones
all remaining conflicts.

* subversion/svn/conflict-callbacks.c
  (text_conflict_options, prop_conflict_options,
   obstructed_add_options, tree_conflict_options): Add the option.
  (handle_text_conflict, handle_prop_conflict,
   handle_tree_conflict, handle_obstructed_add): Implement it.


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