pub unsafe extern "C" fn svn_client_conflict_prop_resolve(
conflict: *mut svn_client_conflict_t,
propname: *const c_char,
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 property @a conflict in property @a propname using resolution option @a option. To resolve all properties to the same option at once, set @a propname to the empty string “”.
@since New in 1.10.