Searched defs:contains_conflicts (Results 1 - 1 of 1) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 386 do_text_merge(svn_boolean_t *contains_conflicts, apr_file_t *result_f, const apr_array_header_t *merge_options, const char *detranslated_target, const char *left, const char *right, const char *target_label, const char *left_label, const char *right_label, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
441 do_text_merge_external(svn_boolean_t *contains_conflicts, apr_file_t *result_f, const char *diff3_cmd, const apr_array_header_t *merge_options, const char *detranslated_target, const char *left_abspath, const char *right_abspath, const char *target_label, const char *left_label, const char *right_label, apr_pool_t *scratch_pool) argument
833 svn_boolean_t contains_conflicts; local
|
Completed in 105 milliseconds