svn_diff_mem_string_output_merge3

Function svn_diff_mem_string_output_merge3 

Source
pub unsafe extern "C" fn svn_diff_mem_string_output_merge3(
    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,
    cancel_func: svn_cancel_func_t,
    cancel_baton: *mut c_void,
    scratch_pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description

Output the @a diff generated by svn_diff_mem_string_diff3() in diff3 format on @a output_stream, using @a original, @a modified and @a latest for content changes.

Use the conflict markers @a conflict_original, @a conflict_modified, @a conflict_latest and @a conflict_separator or the default one for each of these if @c NULL is passed.

@a conflict_style dictates how conflicts are displayed.

If not @c NULL, call @a cancel_func with @a cancel_baton once or multiple times while processing larger diffs.

Uses @a scratch_pool for temporary allocations.

@since New in 1.9.