* subversion/libsvn_client/deprecated.c (svn_client_diff5, svn_client_diff_peg5): New deprecation wrappers.
* subversion/libsvn_client/diff.c (file_printf_from_utf8): Remove. (display_mergeinfo_diff, display_prop_diffs): Accept and use a stream instead of a file. (diff_cmd_baton): Change file handles to streams. (diff_content_changed): Use streams, and create a temp file for interfacing with an external diff tool. (diff_file_deleted): Update params. (svn_client_diff6): Renamed and updated from svn_client_diff5(). (svn_client_diff_peg6): Renamed and updated from svn_client_diff_peg5().