Searched refs:merge_chunks_with_conflict_markers (Results 1 - 1 of 1) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dfile-merge.c434 merge_chunks_with_conflict_markers(apr_array_header_t *chunk1, function
729 conflict_chunk = merge_chunks_with_conflict_markers(chunk1, chunk2,
792 merged_chunk = merge_chunks_with_conflict_markers(chunk1, chunk2,

Completed in 45 milliseconds