Searched defs:merge_target (Results 1 - 3 of 3) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_ra_serf/ |
| H A D | commit.c | 2244 const char *merge_target = local
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | deprecated.c | 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool) argument
4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_pool_t *pool) argument
4678 svn_wc_merge(const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, enum svn_wc_merge_outcome_t *merge_outcome, const char *diff3_cmd, apr_pool_t *pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | merge.c | 7541 svn_client__merge_path_t *merge_target = NULL; local
|
Completed in 217 milliseconds