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

/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dcl.h663 svn_cl__merge_file_externally(const char *base_path,
672 /* Like svn_cl__merge_file_externally, but using a built-in merge tool
H A Dconflict-callbacks.c1064 err = svn_cl__merge_file_externally(base_abspath,
1128 err = svn_cl__merge_file_externally(base_abspath,
2206 err = svn_cl__merge_file_externally(base_abspath, their_abspath,
H A Dutil.c112 svn_cl__merge_file_externally(const char *base_path,
110 svn_cl__merge_file_externally(const char *base_path, function

Completed in 111 milliseconds