Function svn_diff_file_output_merge 

pub unsafe extern "C" fn svn_diff_file_output_merge(
    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,
    display_original_in_conflict: svn_boolean_t,
    display_resolved_conflicts: svn_boolean_t,
    pool: *mut apr_pool_t,
) -> *mut svn_error_t

Similar to svn_diff_file_output_merge2, but with @a display_original_in_conflict and @a display_resolved_conflicts booleans instead of the @a conflict_style enum.

If both booleans are false, acts like svn_diff_conflict_display_modified_latest; if @a display_original_in_conflict is true, acts like svn_diff_conflict_display_modified_original_latest; if @a display_resolved_conflicts is true, acts like svn_diff_conflict_display_resolved_modified_latest. The booleans may not both be true.

@deprecated Provided for backward compatibility with the 1.5 API.