Searched defs:merged_abspath (Results 1 - 1 of 1) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c251 merge_prop_conflict(svn_stream_t *output, const svn_wc_conflict_description2_t *desc, const char *merged_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
312 show_prop_conflict(const svn_wc_conflict_description2_t *desc, const char *merged_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument

Completed in 103 milliseconds