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

/freebsd-11-stable/usr.sbin/etcupdate/
H A Detcupdate.sh820 merge_file() function
1190 merge_file $file
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupdate_editor.c3990 merge_file(svn_skel_t **work_items,
4194 /* Mostly a wrapper around merge_file. */
4382 err = merge_file(&work_item, &conflict_skel,
3986 merge_file(svn_skel_t **work_items, function

Completed in 114 milliseconds