Searched defs:ancestor_root (Results 1 - 4 of 4) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_x/ |
| H A D | tree.c | 1269 x_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_fs/ |
| H A D | fs-loader.c | 1445 svn_fs_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_fs/ |
| H A D | tree.c | 2377 fs_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_fs_base/ |
| H A D | tree.c | 2867 base_merge(const char **conflict_p, svn_fs_root_t *source_root, const char *source_path, svn_fs_root_t *target_root, const char *target_path, svn_fs_root_t *ancestor_root, const char *ancestor_path, apr_pool_t *pool) argument
|
Completed in 102 milliseconds