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

/freebsd-10-stable/usr.sbin/etcupdate/
H A Detcupdate.sh811 merge_file() function
1177 merge_file $file
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupdate_editor.c3979 merge_file(svn_skel_t **work_items,
4183 /* Mostly a wrapper around merge_file. */
4371 err = merge_file(&work_item, &conflict_skel,
3975 merge_file(svn_skel_t **work_items, function

Completed in 62 milliseconds