Searched defs:resolved_diff (Results 1 - 2 of 2) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_diff/
H A Ddiff.h59 svn_diff_t *resolved_diff; member in struct:svn_diff_t
/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dfile-merge.c819 file_merge_output_conflict(void *output_baton, apr_off_t original_start, apr_off_t original_length, apr_off_t modified_start, apr_off_t modified_length, apr_off_t latest_start, apr_off_t latest_length, svn_diff_t *resolved_diff) argument

Completed in 159 milliseconds