Searched refs:resolved_text (Results 1 – 3 of 3) sorted by relevance
377 svn_boolean_t resolved_text = FALSE; in internal_conflicted_p() local453 resolved_text = TRUE; /* Remove in-db conflict marker */ in internal_conflicted_p()499 if (resolved_text || resolved_props) in internal_conflicted_p()508 resolved_text, in internal_conflicted_p()
1602 svn_boolean_t resolved_text,
6284 svn_boolean_t resolved_text, in db_op_mark_resolved() argument6334 resolved_text, in db_op_mark_resolved()6370 svn_boolean_t resolved_text, in svn_wc__db_op_mark_resolved() argument6387 resolved_text, resolved_props, resolved_tree, in svn_wc__db_op_mark_resolved()