Searched refs:diff3_options (Results 1 - 2 of 2) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dmerge.c405 svn_diff_file_options_t *diff3_options;
407 diff3_options = svn_diff_file_options_create(pool);
410 SVN_ERR(svn_diff_file_options_parse(diff3_options,
418 diff3_options, pool));
404 svn_diff_file_options_t *diff3_options; local
H A Dconflicts.c1468 svn_diff_file_options_t *diff3_options;
1470 diff3_options = svn_diff_file_options_create(scratch_pool);
1472 SVN_ERR(svn_diff_file_options_parse(diff3_options,
1489 diff3_options, scratch_pool));
1467 svn_diff_file_options_t *diff3_options; local

Completed in 125 milliseconds