Searched refs:resolution_tree (Results 1 – 1 of 1) sorted by relevance
6559 conflict->resolution_tree = option_id; in resolve_accept_current_wc_state()8403 conflict->resolution_tree = option_id; in resolve_incoming_delete_ignore()8472 conflict->resolution_tree = option_id; in resolve_incoming_delete_accept()8791 conflict->resolution_tree = option_id; in resolve_incoming_move_file_text_merge()9001 conflict->resolution_tree = option_id; in resolve_both_moved_file_text_merge()9149 conflict->resolution_tree = option_id; in resolve_both_moved_dir_merge()9311 conflict->resolution_tree = option_id; in resolve_both_moved_dir_move_merge()9543 conflict->resolution_tree = option_id; in resolve_incoming_move_dir_merge()11304 conflict->resolution_tree = option_id; in resolve_both_moved_file_update_keep_local_move()11510 conflict->resolution_tree = option_id; in resolve_both_moved_file_update_keep_incoming_move()[all …]