Searched refs:resolved_text (Results 1 – 4 of 4) sorted by relevance
369 svn_boolean_t resolved_text = FALSE; in internal_conflicted_p() local446 resolved_text = TRUE; /* Remove in-db conflict marker */ in internal_conflicted_p()492 if (resolved_text || resolved_props) in internal_conflicted_p()501 resolved_text, in internal_conflicted_p()
509 svn_boolean_t resolved_text,
1660 svn_boolean_t resolved_text,
6653 svn_boolean_t resolved_text, in svn_wc__db_op_mark_resolved_internal() argument6709 resolved_text, in svn_wc__db_op_mark_resolved_internal()6743 svn_boolean_t resolved_text, in svn_wc__db_op_mark_resolved() argument6761 resolved_text, resolved_props, resolved_tree, in svn_wc__db_op_mark_resolved()