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

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dmerge.c781 * conflicted them needlessly, while merge_text_file figured it out
817 merge_text_file(svn_skel_t **work_items,
1174 SVN_ERR(merge_text_file(work_items,
816 merge_text_file(svn_skel_t **work_items, function

Completed in 95 milliseconds