Searched defs:conflicted_propname (Results 1 - 1 of 1) sorted by relevance
| /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
|
Completed in 126 milliseconds