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

/freebsd-10-stable/contrib/subversion/subversion/svn/
H A Dconflict-callbacks.c375 edit_prop_conflict(const char **merged_file_path, const svn_wc_conflict_description2_t *desc, svn_cl__interactive_conflict_baton_t *b, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1030 const char *merged_file_path = NULL; local

Completed in 579 milliseconds