Searched refs:resolution_options (Results 1 – 2 of 2) sorted by relevance
| /freebsd-13.1/contrib/subversion/subversion/svn/ |
| H A D | conflict-callbacks.c | 1298 apr_array_header_t *resolution_options; in handle_one_prop_conflict() local
1318 SVN_ERR(svn_client_conflict_prop_get_resolution_options(&resolution_options, in handle_one_prop_conflict()
1351 *option = svn_client_conflict_option_find_by_id(resolution_options, in handle_one_prop_conflict()
1382 resolution_options, in handle_one_prop_conflict()
1390 *option = svn_client_conflict_option_find_by_id(resolution_options, in handle_one_prop_conflict()
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 12776 apr_array_header_t *resolution_options; in svn_client_conflict_text_resolve_by_id() local
12780 &resolution_options, conflict, ctx, in svn_client_conflict_text_resolve_by_id()
12782 option = svn_client_conflict_option_find_by_id(resolution_options, in svn_client_conflict_text_resolve_by_id()
12825 apr_array_header_t *resolution_options; in svn_client_conflict_prop_resolve_by_id() local
12829 &resolution_options, conflict, ctx, in svn_client_conflict_prop_resolve_by_id()
12831 option = svn_client_conflict_option_find_by_id(resolution_options, in svn_client_conflict_prop_resolve_by_id()
12878 apr_array_header_t *resolution_options; in svn_client_conflict_tree_resolve_by_id() local
12882 &resolution_options, conflict, ctx, in svn_client_conflict_tree_resolve_by_id()
12884 option = svn_client_conflict_option_find_by_id(resolution_options, in svn_client_conflict_tree_resolve_by_id()
|