Searched defs:incoming_base (Results 1 - 1 of 1) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | props.c | 356 generate_conflict_message(const char *propname, const svn_string_t *original, const svn_string_t *mine, const svn_string_t *incoming, const svn_string_t *incoming_base, apr_pool_t *result_pool) argument
513 prop_conflict_new(const svn_string_t **conflict_desc, const char *propname, const svn_string_t *original, const svn_string_t *mine, const svn_string_t *incoming, const svn_string_t *incoming_base, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
679 const svn_string_t *incoming_base; local
[all...] |
Completed in 157 milliseconds