Searched defs:conflict_report (Results 1 – 2 of 2) sorted by relevance
7522 single_range_conflict_report_t **conflict_report, in do_file_merge()8079 do_mergeinfo_unaware_dir_merge(single_range_conflict_report_t **conflict_report, in do_mergeinfo_unaware_dir_merge()9365 single_range_conflict_report_t **conflict_report, in do_mergeinfo_aware_dir_merge()9685 single_range_conflict_report_t **conflict_report, in do_directory_merge()9835 svn_client__conflict_report_t **conflict_report, in do_merge()10144 svn_client__conflict_report_t **conflict_report, in merge_cousins_and_supplement_mergeinfo()10485 svn_client__merge_locked(svn_client__conflict_report_t **conflict_report, in svn_client__merge_locked()10698 svn_client__conflict_report_t *conflict_report; in svn_client_merge5() local11764 merge_reintegrate_locked(svn_client__conflict_report_t **conflict_report, in merge_reintegrate_locked()11839 svn_client__conflict_report_t *conflict_report; in svn_client_merge_reintegrate() local[all …]
9038 svn_client__conflict_report_t *conflict_report; in resolve_both_moved_dir_merge() local9186 svn_client__conflict_report_t *conflict_report; in resolve_both_moved_dir_move_merge() local9349 svn_client__conflict_report_t *conflict_report; in resolve_incoming_move_dir_merge() local9756 svn_client__conflict_report_t *conflict_report; in resolve_local_move_dir_merge() local