Make the single file merge code use the diff processor instead of calling the implementation directly.
Make the single file merge code use the diff processor instead of calling
the implementation directly.

* subversion/libsvn_client/merge.c
  (do_file_merge): Call the diff processor instead of calling the
    implementation directly.


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

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