| /freebsd-11-stable/usr.sbin/etcupdate/tests/ |
| H A D | preworld_test.sh | 191 conflict() function
|
| H A D | always_test.sh | 355 conflict() function
[all...] |
| H A D | conflicts_test.sh | 178 conflict() function
[all...] |
| H A D | fbsdid_test.sh | 257 conflict() function
[all...] |
| H A D | ignore_test.sh | 152 conflict() function
|
| H A D | tests_test.sh | 733 conflict() function
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | ctx.c | 56 call_conflict_func(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
| /freebsd-11-stable/crypto/openssl/crypto/engine/ |
| H A D | eng_list.c | 105 int conflict = 0; local
|
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | resolve-cmd.c | 57 conflict_walker(void *baton, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
109 svn_client_conflict_t *conflict; local
|
| H A D | cl-conflicts.c | 222 svn_cl__get_human_readable_prop_conflict_description( const char **desc, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
281 svn_cl__get_human_readable_tree_conflict_description( const char **desc, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
405 append_tree_conflict_info_xml(svn_stringbuf_t *str, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
473 svn_cl__append_conflict_info_xml(svn_stringbuf_t *str, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
[all...] |
| H A D | shelf-cmd.c | 599 svn_boolean_t conflict; local
|
| H A D | shelf2-cmd.c | 599 svn_boolean_t conflict; local
|
| H A D | conflict-callbacks.c | 92 show_diff(svn_client_conflict_t *conflict, const char *merged_abspath, const char *path_prefix, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
174 show_conflicts(svn_client_conflict_t *conflict, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
572 find_option_by_builtin(client_option_t **out, svn_client_conflict_t *conflict, const resolver_option_t *options, svn_client_conflict_option_t *builtin_option, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
763 build_text_conflict_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, svn_boolean_t is_binary, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
826 mark_conflict_resolved(svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_boolean_t text_conflicted, const char *propname, svn_boolean_t tree_conflicted, const char *path_prefix, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
873 handle_text_conflict(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
1225 build_prop_conflict_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1279 handle_one_prop_conflict(svn_client_conflict_option_t **option, svn_boolean_t *quit, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_client_conflict_t *conflict, const char *propname, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1404 handle_prop_conflicts(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, const svn_string_t **merged_value, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_client_conflict_t *conflict, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1473 build_tree_conflict_options( apr_array_header_t **options, apr_array_header_t **possible_moved_to_repos_relpaths, apr_array_header_t **possible_moved_to_abspaths, svn_boolean_t *all_options_are_dumb, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1750 handle_tree_conflict(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
1973 resolve_conflict_interactively(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *external_failed, svn_boolean_t *printed_summary, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *editor_cmd, apr_hash_t *config, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
2029 svn_cl__resolve_conflict(svn_boolean_t *quit, svn_boolean_t *external_failed, svn_boolean_t *printed_summary, svn_client_conflict_t *conflict, svn_cl__accept_t accept_which, const char *editor_cmd, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
[all...] |
| H A D | info-cmd.c | 687 svn_client_conflict_t *conflict; local
890 svn_client_conflict_t *conflict; local
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | delete.c | 134 svn_skel_t *conflict; local
|
| H A D | util.c | 195 svn_wc_conflict_description2_t *conflict; local
214 svn_wc_conflict_description2_t *conflict; local
235 svn_wc_conflict_description2_t *conflict; local
278 svn_wc_conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
359 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool) argument
[all...] |
| H A D | tree_conflicts.c | 200 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, argument
332 svn_wc__serialize_conflict(svn_skel_t **skel, const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
406 svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...] |
| H A D | copy.c | 256 svn_skel_t *conflict; local
948 svn_skel_t *conflict; local
[all...] |
| /freebsd-11-stable/gnu/usr.bin/rcs/lib/ |
| H A D | partime.c | 645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
663 # undef conflict macro
[all...] |
| /freebsd-11-stable/usr.bin/localedef/ |
| H A D | ctype.c | 326 int conflict = 0; local
|
| /freebsd-11-stable/sys/dev/drm2/radeon/ |
| H A D | radeon_connectors.c | 254 struct drm_connector *conflict; local
[all...] |
| /freebsd-11-stable/usr.sbin/timed/timed/ |
| H A D | timed.c | 475 struct tsp resp, conflict, *answer; local
|
| /freebsd-11-stable/sbin/gvinum/ |
| H A D | gvinum.c | 574 int i, n, begin, len, conflict; local
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_repos/ |
| H A D | commit.c | 806 const char *conflict; local
|
| /freebsd-11-stable/contrib/ncurses/progs/ |
| H A D | tic.c | 1945 bool conflict = FALSE; local
|