svn_wc_merge2

subversion_sys

Function svn_wc_merge2 

Source 
pub unsafe extern "C" fn svn_wc_merge2(
    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,
    pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description

Similar to svn_wc_merge3(), but with @a prop_diff, @a conflict_func, @a conflict_baton set to NULL.

@deprecated Provided for backwards compatibility with the 1.4 API.