Searched defs:conflicted_prop_names (Results 1 - 1 of 1) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | conflicts.c | 416 svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, const char *marker_abspath, const apr_hash_t *mine_props, const apr_hash_t *their_old_props, const apr_hash_t *their_props, const apr_hash_t *conflicted_prop_names, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
857 svn_wc__conflict_read_prop_conflict(const char **marker_abspath, apr_hash_t **mine_props, apr_hash_t **their_old_props, apr_hash_t **their_props, apr_hash_t **conflicted_prop_names, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
Completed in 128 milliseconds