Allow exiting from the interactive file merge tool without having to postpone every conflicting section in the file.
Allow exiting from the interactive file merge tool without having to
postpone every conflicting section in the file.

Suggested by: jcorvel

* subversion/svn/file-merge.c
  (file_merge_baton): Add abort_merge member.
  (file_merge_output_common,
   file_merge_output_diff_modified,
   file_merge_output_diff_latest,
   file_merge_output_diff_common): Do nothing if merge has been aborted.
  (merge_chunks): Add abort_merge output parameter, and offer the user the
   option of aborting the entire merge.
  (merge_file_chunks): Add abort_merge output paramter, pass it through to
   merge_chunks() and abort the merge if it gets set.
  (file_merge_output_conflict): Do nothing if merge has been aborted, and
   pass the abort_merge baton member to merge_file_chunks().
  (svn_cl__merge_file): Initialise abort_merge in the file_merge_baton and
   remove the temporary merged file in case the user aborts the merge.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion