Searched refs:base_merge (Results 1 – 3 of 3) sorted by relevance
| /freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/ |
| D | deprecated.c | 2579 svn_boolean_t base_merge, in svn_wc_merge_props2() argument
2590 if (base_merge && !dry_run) in svn_wc_merge_props2()
2637 svn_boolean_t base_merge, in svn_wc_merge_props() argument
2642 base_merge, dry_run, NULL, NULL, pool); in svn_wc_merge_props()
2651 svn_boolean_t base_merge, in svn_wc_merge_prop_diffs() argument
2659 base_merge, dry_run, NULL, NULL, pool); in svn_wc_merge_prop_diffs()
|
| /freebsd-10-stable/contrib/subversion/subversion/include/ |
| D | svn_wc.h | 7173 svn_boolean_t base_merge,
7194 svn_boolean_t base_merge,
7216 svn_boolean_t base_merge,
|
| /freebsd-10-stable/contrib/subversion/subversion/libsvn_fs_base/ |
| D | tree.c | 2854 base_merge(const char **conflict_p, in base_merge() function
5525 base_merge,
|