Searched defs:conflict_p (Results 1 – 8 of 8) sorted by relevance
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_fs_x/ |
| HD | tree.c | 736 merge(svn_stringbuf_t *conflict_p, in merge()
1119 svn_fs_x__commit_txn(const char **conflict_p, in svn_fs_x__commit_txn()
1269 x_merge(const char **conflict_p, in x_merge()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_repos/ |
| HD | fs-wrap.c | 48 svn_repos_fs_commit_txn(const char **conflict_p, in svn_repos_fs_commit_txn()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_fs_fs/ |
| HD | tree.c | 1822 merge(svn_stringbuf_t *conflict_p, in merge()
2226 svn_fs_fs__commit_txn(const char **conflict_p, in svn_fs_fs__commit_txn()
2377 fs_merge(const char **conflict_p, in fs_merge()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_fs/ |
| HD | fs-loader.c | 862 svn_fs_commit_txn(const char **conflict_p, svn_revnum_t *new_rev, in svn_fs_commit_txn()
1445 svn_fs_merge(const char **conflict_p, svn_fs_root_t *source_root, in svn_fs_merge()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_client/ |
| HD | shelf.c | 784 svn_client__shelf_test_apply_file(svn_boolean_t *conflict_p, in svn_client__shelf_test_apply_file()
|
| HD | shelf2.c | 1843 svn_client__shelf2_test_apply_file(svn_boolean_t *conflict_p, in svn_client__shelf2_test_apply_file()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_fs_base/ |
| HD | tree.c | 2102 merge(svn_stringbuf_t *conflict_p, in merge()
2719 svn_fs_base__commit_txn(const char **conflict_p, in svn_fs_base__commit_txn()
2867 base_merge(const char **conflict_p, in base_merge()
|
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/ |
| HD | wc_db_update_move.c | 389 create_tree_conflict(svn_skel_t **conflict_p, in create_tree_conflict()
545 create_node_tree_conflict(svn_skel_t **conflict_p, in create_node_tree_conflict()
|