Function svn_diff_file_output_merge2 

pub unsafe extern "C" fn svn_diff_file_output_merge2(
    output_stream: *mut svn_stream_t,
    diff: *mut svn_diff_t,
    original_path: *const c_char,
    modified_path: *const c_char,
    latest_path: *const c_char,
    conflict_original: *const c_char,
    conflict_modified: *const c_char,
    conflict_latest: *const c_char,
    conflict_separator: *const c_char,
    conflict_style: svn_diff_conflict_display_style_t,
    pool: *mut apr_pool_t,
) -> *mut svn_error_t

Similar to svn_diff_file_output_merge3, but without cancel support.

@since New in 1.6.

@deprecated Provided for backward compatibility with the 1.8 API.