Searched refs:svn_wc_conflict_choose_theirs_conflict (Results 1 – 4 of 4) sorted by relevance
65 conflict_choice = svn_wc_conflict_choose_theirs_conflict; in svn_cl__resolve()
467 svn_wc_conflict_choose_theirs_conflict },925 || opt->choice == svn_wc_conflict_choose_theirs_conflict) in handle_text_conflict()1223 (*result)->choice = svn_wc_conflict_choose_theirs_conflict; in conflict_func_interactive()
1575 case svn_wc_conflict_choose_theirs_conflict: in eval_text_conflict_func_result()1592 style = choice == svn_wc_conflict_choose_theirs_conflict in eval_text_conflict_func_result()2422 case svn_wc_conflict_choose_theirs_conflict: in resolve_text_conflict_on_node()2431 conflict_choice == svn_wc_conflict_choose_theirs_conflict in resolve_text_conflict_on_node()2619 case svn_wc_conflict_choose_theirs_conflict: in resolve_prop_conflict_on_node()
2068 svn_wc_conflict_choose_theirs_conflict, /**< incoming (for conflicted hunks) */ enumerator