Searched refs:svn_wc__conflict_skel_add_text_conflict (Results 1 – 5 of 5) sorted by relevance
150 svn_wc__conflict_skel_add_text_conflict(svn_skel_t *conflict_skel,
907 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(*conflict_skel, in merge_text_file()1065 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(*conflict_skel, in merge_binary_file()
1304 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflicts, db, in run_set_text_conflict_markers()
1189 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(conflict_data, in svn_wc__upgrade_conflict_skel_from_raw()
345 svn_wc__conflict_skel_add_text_conflict(svn_skel_t *conflict_skel, in svn_wc__conflict_skel_add_text_conflict() function