svn_client_conflict_text_resolve

Function svn_client_conflict_text_resolve 

Source
pub unsafe extern "C" fn svn_client_conflict_text_resolve(
    conflict: *mut svn_client_conflict_t,
    option: *mut svn_client_conflict_option_t,
    ctx: *mut svn_client_ctx_t,
    scratch_pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description

Resolve a text @a conflict using resolution option @a option.

@since New in 1.10.