svn_diff_mem_string_output_merge2

subversion_sys

Function svn_diff_mem_string_output_merge2 

Source 
pub unsafe extern "C" fn svn_diff_mem_string_output_merge2(
    output_stream: *mut svn_stream_t,
    diff: *mut svn_diff_t,
    original: *const svn_string_t,
    modified: *const svn_string_t,
    latest: *const svn_string_t,
    conflict_original: *const c_char,
    conflict_modified: *const c_char,
    conflict_latest: *const c_char,
    conflict_separator: *const c_char,
    style: svn_diff_conflict_display_style_t,
    pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description

Similar to svn_diff_mem_string_output_merge2(), but without cancel support.

@since New in 1.6.

@deprecated Provided for backwards compatibility with the 1.8 API.