Searched defs:base_propval (Results 1 - 2 of 2) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | conflict-callbacks.c | 217 merge_prop_conflict(svn_stream_t *output, const svn_string_t *base_propval, const svn_string_t *my_propval, const svn_string_t *their_propval, const svn_string_t *merged_propval, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
266 show_prop_conflict(const svn_string_t *base_propval, const svn_string_t *my_propval, const svn_string_t *their_propval, const svn_string_t *merged_propval, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
334 edit_prop_conflict(const svn_string_t **merged_propval, const svn_string_t *base_propval, const svn_string_t *my_propval, const svn_string_t *their_propval, const char *editor_cmd, apr_hash_t *config, svn_cmdline_prompt_baton_t *pb, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1295 const svn_string_t *base_propval; local
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 13094 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval, const svn_string_t **working_propval, const svn_string_t **incoming_old_propval, const svn_string_t **incoming_new_propval, svn_client_conflict_t *conflict, const char *propname, apr_pool_t *result_pool) argument
|
Completed in 130 milliseconds