Searched defs:merge_content_outcome (Results 1 - 2 of 2) sorted by path
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 1205 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, enum svn_wc_notify_state_t *merge_props_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_hash_t *original_props, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 6892 svn_wc_merge_outcome_t merge_content_outcome; local
7040 svn_wc_merge_outcome_t merge_content_outcome; local
7177 svn_wc_merge_outcome_t merge_content_outcome; local
7589 svn_wc_merge_outcome_t merge_content_outcome; local
8505 svn_wc_merge_outcome_t merge_content_outcome; local
8837 svn_wc_merge_outcome_t merge_content_outcome; local
9580 svn_wc_merge_outcome_t merge_content_outcome; local
11136 svn_wc_merge_outcome_t merge_content_outcome; local
11346 svn_wc_merge_outcome_t merge_content_outcome; local
[all...] |
Completed in 220 milliseconds