Searched refs:svn_wc__resolve_conflicts (Results 1 – 3 of 3) sorted by relevance
70 SVN_ERR(svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath, in svn_client__resolve_conflicts()130 err = svn_wc__resolve_conflicts(ctx->wc_ctx, local_abspath, in svn_client_resolve()
1750 svn_wc__resolve_conflicts(svn_wc_context_t *wc_ctx,
3018 svn_wc__resolve_conflicts(svn_wc_context_t *wc_ctx, in svn_wc__resolve_conflicts() function3117 return svn_error_trace(svn_wc__resolve_conflicts(wc_ctx, local_abspath, in svn_wc_resolved_conflict5()