Function svn_wc_merge3 

pub unsafe extern "C" fn svn_wc_merge3(
    merge_outcome: *mut svn_wc_merge_outcome_t,
    left: *const c_char,
    right: *const c_char,
    merge_target: *const c_char,
    adm_access: *mut svn_wc_adm_access_t,
    left_label: *const c_char,
    right_label: *const c_char,
    target_label: *const c_char,
    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_func_t,
    conflict_baton: *mut c_void,
    pool: *mut apr_pool_t,
) -> *mut svn_error_t

Similar to svn_wc_merge4() but takes relative paths and an access baton. It doesn’t support a cancel function or tracking origin version information.

Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a svn_wc_conflict_resolver_func2_t.

This function assumes that @a diff3_cmd is path encoded. Later versions assume utf-8.

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