Searched defs:conflict_choice (Results 1 – 4 of 4) sorted by relevance
110 svn_wc_conflict_choice_t conflict_choice, in svn_client_resolve()
6410 svn_wc_conflict_choice_t conflict_choice; in resolve_text_conflict() local6447 svn_wc_conflict_choice_t conflict_choice; in resolve_prop_conflict() local
2432 svn_wc_conflict_choice_t conflict_choice, in resolve_prop_conflict_on_node()2689 svn_wc_conflict_choice_t conflict_choice, in resolve_tree_conflict_on_node()2976 svn_wc_conflict_choice_t conflict_choice; member3203 svn_wc_conflict_choice_t conflict_choice, in svn_wc__resolve_conflicts()3361 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict5()
1249 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict4()1328 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict3()