subversion/svn/conflict-callbacks.c

93   /* Shorthand options are consistent with  svn_cl__conflict_handler(). */
137   svn_diff_file_options_t *options;
183   options = svn_diff_file_options_create(pool);
184   options->ignore_eol_style = TRUE;
187                                options, pool));
205   svn_diff_file_options_t *options;
207   options = svn_diff_file_options_create(pool);
208   options->ignore_eol_style = TRUE;
214                                 options, pool));
246   svn_diff_file_options_t *options = svn_diff_file_options_create(pool);
266   options->ignore_eol_style = TRUE;
271                                 options, pool));
445 /* Resolver options for a text conflict */
486   { "s",  N_("show all options"), N_("show this list (also 'h', '?')"), -1 },
490 /* Resolver options for a property conflict */
513 /* Resolver options for an obstructued addition */
531 /* Resolver options for a tree conflict */
612 find_option(const resolver_option_t *options,
617   for (opt = options; opt->code; opt++)
626 /* Return a prompt string listing the options OPTIONS. If OPTION_CODES is
627  * non-null, select only the options whose codes are mentioned in it. */
629 prompt_string(const resolver_option_t *options,
649           opt = find_option(options, *option_codes++);
653           opt = options++;
678 help_string(const resolver_option_t *options,
684   for (opt = options; opt->code; opt++)
706 /* Prompt the user with CONFLICT_OPTIONS, restricted to the options listed
782       const char *options[ARRAY_LEN(text_conflict_options)];
783       const char **next_option = options;
814       SVN_ERR(prompt_user(&opt, text_conflict_options, options, b->pb,
1000       const char *options[ARRAY_LEN(prop_conflict_options)];
1001       const char **next_option = options;
1016       SVN_ERR(prompt_user(&opt, prop_conflict_options, options, b->pb,