Searched refs:completely_resolved (Results 1 - 2 of 2) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h272 svn_wc__conflict_skel_resolve(svn_boolean_t *completely_resolved,
H A Dconflicts.c609 svn_wc__conflict_skel_resolve(svn_boolean_t *completely_resolved,
680 if (completely_resolved)
687 *completely_resolved = !complete_conflict;
608 svn_wc__conflict_skel_resolve(svn_boolean_t *completely_resolved, svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, svn_boolean_t resolve_text, const char *resolve_prop, svn_boolean_t resolve_tree, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument

Completed in 102 milliseconds