Searched refs:svn_client_conflict_text_resolve (Results 1 – 2 of 2) sorted by relevance
5370 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict,
12737 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict, in svn_client_conflict_text_resolve() function12792 SVN_ERR(svn_client_conflict_text_resolve(conflict, option, ctx, scratch_pool)); in svn_client_conflict_text_resolve_by_id()