Home
last modified time | relevance | path

Searched refs:resolve_text (Results 1 – 5 of 5) sorted by relevance

/freebsd-12.1/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h270 svn_boolean_t resolve_text,
H A Dconflicts.c596 svn_boolean_t resolve_text, in svn_wc__conflict_skel_resolve() argument
619 if (resolve_text in svn_wc__conflict_skel_resolve()
2938 svn_boolean_t resolve_text; member
3023 || (cd->kind == svn_wc_conflict_kind_text && !cswb->resolve_text) in conflict_status_walker()
3131 if (cswb->resolve_text && cswb->resolve_tree && in conflict_status_walker()
3165 svn_boolean_t resolve_text, in svn_wc__resolve_conflicts() argument
3185 cswb.resolve_text = resolve_text; in svn_wc__resolve_conflicts()
3323 svn_boolean_t resolve_text, in svn_wc_resolved_conflict5() argument
3334 depth, resolve_text, in svn_wc_resolved_conflict5()
H A Ddeprecated.c1218 svn_boolean_t resolve_text, in svn_wc_resolved_conflict4() argument
1239 resolve_text, in svn_wc_resolved_conflict4()
1256 svn_boolean_t resolve_text, in svn_wc_resolved_conflict() argument
1269 resolve_text, resolve_props, recurse, in svn_wc_resolved_conflict()
1278 svn_boolean_t resolve_text, in svn_wc_resolved_conflict2() argument
1287 return svn_wc_resolved_conflict3(path, adm_access, resolve_text, in svn_wc_resolved_conflict2()
1298 svn_boolean_t resolve_text, in svn_wc_resolved_conflict3() argument
1308 return svn_wc_resolved_conflict4(path, adm_access, resolve_text, in svn_wc_resolved_conflict3()
/freebsd-12.1/contrib/subversion/subversion/include/
H A Dsvn_wc.h5096 svn_boolean_t resolve_text,
5117 svn_boolean_t resolve_text,
5140 svn_boolean_t resolve_text,
5164 svn_boolean_t resolve_text,
5183 svn_boolean_t resolve_text,
/freebsd-12.1/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h1753 svn_boolean_t resolve_text,