Searched refs:svn_diff__resolve_conflict (Results 1 – 3 of 3) sorted by relevance
162 svn_diff__resolve_conflict(svn_diff_t *hunk,
38 svn_diff__resolve_conflict(svn_diff_t *hunk, in svn_diff__resolve_conflict() function451 svn_diff__resolve_conflict(*diff_ref, in svn_diff_diff3_2()
304 svn_diff__resolve_conflict(hunk, &position_list[1], in svn_diff_diff4_2()