Searched defs:merged_value (Results 1 - 4 of 4) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | conflict-callbacks.c | 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
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | conflicts.c | 2427 resolve_prop_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflicts, const char *conflicted_propname, svn_wc_conflict_choice_t conflict_choice, const char *merged_file, const svn_string_t *merged_value, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
3442 svn_wc__conflict_prop_mark_resolved(svn_wc_context_t *wc_ctx, const char *local_abspath, const char *propname, svn_wc_conflict_choice_t choice, const svn_string_t *merged_value, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool) argument
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/include/ |
| H A D | svn_wc.h | 2228 const svn_string_t *merged_value; member in struct:svn_wc_conflict_result_t
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 6452 const svn_string_t *merged_value; local
|
Completed in 240 milliseconds