trunk
Apply the standard pre-branch whitespace cleanup via tools/dev/remove-trailing-whitespace.zsh
Add svn_diff_file_output_merge3() with cancel support and update callers.