Lines Matching refs:choice
381 svn_client_conflict_option_id_t choice;
391 svn_client_conflict_option_id_t choice;
589 if (opt->choice == id)
594 client_opt->choice = id;
992 option_id = opt->choice;
1174 else if (opt->choice != svn_client_conflict_option_undefined)
1176 if ((opt->choice == svn_client_conflict_option_working_text_where_conflicted
1177 || opt->choice == svn_client_conflict_option_incoming_text_where_conflicted)
1190 if (opt->choice == svn_client_conflict_option_merged_text
1200 option_id = opt->choice;
1353 opt->choice);
1389 else if (opt->choice != svn_client_conflict_option_undefined)
1392 opt->choice);
1529 opt->choice = svn_client_conflict_option_get_id(builtin_option);
1560 /* Add move target choice options only if there are multiple
1652 /* Keep asking the user until we got a valid choice. */
1813 err = mark_conflict_resolved(conflict, recommended_option->choice,
1866 option_id = opt->choice;
1948 else if (opt->choice != svn_client_conflict_option_undefined)
1950 option_id = opt->choice;