Searched refs:svn_diff_mem_string_output_merge3 (Results 1 – 7 of 7) sorted by relevance
404 return svn_error_trace(svn_diff_mem_string_output_merge3(output_stream, diff, in svn_diff_mem_string_output_merge2()
1051 svn_diff_mem_string_output_merge3(svn_stream_t *output_stream, in svn_diff_mem_string_output_merge3() function
953 svn_diff_mem_string_output_merge3(svn_stream_t *output_stream,
243 SVN_ERR(svn_diff_mem_string_output_merge3( in merge_prop_conflict()
614 SVN_ERR(svn_diff_mem_string_output_merge3(stream, diff, in prop_conflict_new()
1316 SVN_ERR(svn_diff_mem_string_output_merge3(mergestream, diff, in generate_propconflict()
1674 * new API svn_diff_mem_string_output_merge3() (r1618599)