Home
last modified time | relevance | path

Searched refs:output_conflict_with_context_marker (Results 1 – 2 of 2) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_diff/
HDdiff_memory.c951 output_conflict_with_context_marker(merge_output_baton_t *btn, in output_conflict_with_context_marker() function
995 SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[1], in output_conflict_with_context()
1001 SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[0], in output_conflict_with_context()
1010 SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[3], in output_conflict_with_context()
HDdiff_file.c2223 output_conflict_with_context_marker(svn_diff3__file_output_baton_t *btn, in output_conflict_with_context_marker() function
2264 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_modified, in output_conflict_with_context()
2268 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_original, in output_conflict_with_context()
2275 SVN_ERR(output_conflict_with_context_marker(btn, btn->conflict_latest, in output_conflict_with_context()