Searched refs:svn_diff_contains_conflicts (Results 1 – 4 of 4) sorted by relevance
48 svn_diff_contains_conflicts(svn_diff_t *diff) in svn_diff_contains_conflicts() function
264 svn_diff_contains_conflicts(svn_diff_t *diff);
432 *contains_conflicts = svn_diff_contains_conflicts(diff); in do_text_merge()
590 if (svn_diff_contains_conflicts(diff)) in prop_conflict_new()