Function svn_wc_merge4 

pub unsafe extern "C" fn svn_wc_merge4(
    merge_outcome: *mut svn_wc_merge_outcome_t,
    wc_ctx: *mut svn_wc_context_t,
    left_abspath: *const c_char,
    right_abspath: *const c_char,
    target_abspath: *const c_char,
    left_label: *const c_char,
    right_label: *const c_char,
    target_label: *const c_char,
    left_version: *const svn_wc_conflict_version_t,
    right_version: *const svn_wc_conflict_version_t,
    dry_run: svn_boolean_t,
    diff3_cmd: *const c_char,
    merge_options: *const apr_array_header_t,
    prop_diff: *const apr_array_header_t,
    conflict_func: svn_wc_conflict_resolver_func2_t,
    conflict_baton: *mut c_void,
    cancel_func: svn_cancel_func_t,
    cancel_baton: *mut c_void,
    scratch_pool: *mut apr_pool_t,
) -> *mut svn_error_t

Similar to svn_wc_merge5() but with @a merge_props_state and @a original_props always passed as NULL.

Unlike svn_wc_merge5(), this function doesn’t merge property changes. Callers of this function must first use svn_wc_merge_props3() to get this functionality.

@since New in 1.7. @deprecated Provided for backwards compatibility with the 1.7 API.