Searched refs:do_resolve_func (Results 1 – 1 of 1) sorted by relevance
133 conflict_option_resolve_func_t do_resolve_func; member9920 option->do_resolve_func = resolve_func; in add_resolution_option()10077 conflict_option_resolve_func_t do_resolve_func; in configure_option_accept_current_wc_state() local10094 do_resolve_func = resolve_update_break_moved_away; in configure_option_accept_current_wc_state()10097 do_resolve_func = resolve_accept_current_wc_state; in configure_option_accept_current_wc_state()10103 do_resolve_func); in configure_option_accept_current_wc_state()12743 SVN_ERR(option->do_resolve_func(option, conflict, ctx, scratch_pool)); in svn_client_conflict_text_resolve()12812 SVN_ERR(option->do_resolve_func(option, conflict, ctx, scratch_pool)); in svn_client_conflict_prop_resolve()12866 SVN_ERR(option->do_resolve_func(option, conflict, ctx, scratch_pool)); in svn_client_conflict_tree_resolve()