pub unsafe extern "C" fn svn_diff_file_output_merge3(
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,
cancel_func: svn_cancel_func_t,
cancel_baton: *mut c_void,
scratch_pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description
A convenience function to produce diff3 output from the diff generated by svn_diff_file_diff3().
Output a @a diff between @a original_path, @a modified_path and @a latest_path in merged format to @a output_stream. Optionally supply @a conflict_modified, @a conflict_original, @a conflict_separator and/or @a conflict_latest to be displayed as conflict markers in the output. If @a conflict_original, @a conflict_modified, @a conflict_latest and/or @a conflict_separator is @c NULL, a default marker will be displayed. @a conflict_style dictates how conflicts are displayed. Uses @a scratch_pool for temporary allocations.
If not @c NULL, call @a cancel_func with @a cancel_baton once or multiple times while processing larger diffs.
@since New in 1.9.