Searched defs:option_id (Results 1 – 2 of 2) sorted by relevance
827 svn_client_conflict_option_id_t option_id, in mark_conflict_resolved()903 svn_client_conflict_option_id_t option_id; in handle_text_conflict() local1432 svn_client_conflict_option_id_t option_id; in handle_prop_conflicts() local1763 svn_client_conflict_option_id_t option_id; in handle_tree_conflict() local2045 svn_client_conflict_option_id_t option_id; in svn_cl__resolve_conflict() local
159 svn_client_conflict_option_id_t option_id) in conflict_option_id_to_wc_conflict_choice()5066 svn_client_conflict_option_id_t option_id = recommended[i]; in init_wc_move_targets() local6407 svn_client_conflict_option_id_t option_id; in resolve_text_conflict() local6446 svn_client_conflict_option_id_t option_id; in resolve_prop_conflict() local6524 svn_client_conflict_option_id_t option_id; in resolve_accept_current_wc_state() local6679 svn_client_conflict_option_id_t option_id; in verify_local_state_for_incoming_add_upon_update() local8369 svn_client_conflict_option_id_t option_id; in resolve_incoming_delete_ignore() local8415 svn_client_conflict_option_id_t option_id; in resolve_incoming_delete_accept() local8484 svn_client_conflict_option_id_t option_id; in resolve_incoming_move_file_text_merge() local8817 svn_client_conflict_option_id_t option_id; in resolve_both_moved_file_text_merge() local[all …]