Searched refs:svn_diff__resolve_conflict (Results 1 - 3 of 3) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_diff/
H A Ddiff.h162 svn_diff__resolve_conflict(svn_diff_t *hunk,
H A Ddiff4.c304 svn_diff__resolve_conflict(hunk, &position_list[1],
H A Ddiff3.c39 svn_diff__resolve_conflict(svn_diff_t *hunk, function
452 svn_diff__resolve_conflict(*diff_ref,

Completed in 46 milliseconds