Searched defs:merged_file (Results 1 - 3 of 3) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | file-merge.c | 71 apr_file_t *merged_file; member in struct:file_merge_baton
93 copy_to_merged_file(svn_linenum_t *new_current_line, apr_file_t *merged_file, apr_file_t *source_file, apr_off_t start, apr_off_t len, svn_linenum_t current_line, apr_pool_t *scratch_pool) argument
753 merge_file_chunks(svn_boolean_t *remains_in_conflict, svn_boolean_t *abort_merge, apr_file_t *merged_file, apr_file_t *file1, apr_file_t *file2, apr_off_t start1, apr_off_t len1, apr_off_t start2, apr_off_t len2, svn_linenum_t *current_line1, svn_linenum_t *current_line2, const char *editor_cmd, apr_hash_t *config, apr_pool_t *scratch_pool) argument
878 apr_file_t *merged_file; local
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | conflicts.c | 1600 build_text_conflict_resolve_items(svn_skel_t **work_items, svn_boolean_t *found_artifact, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict, svn_wc_conflict_choice_t choice, const char *merged_file, svn_boolean_t save_merged, const apr_array_header_t *merge_options, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2427 resolve_prop_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflicts, const char *conflicted_propname, svn_wc_conflict_choice_t conflict_choice, const char *merged_file, const svn_string_t *merged_value, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
3380 svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, const char *merged_file, apr_pool_t *pool) argument
[all...] |
| /freebsd-11-stable/contrib/subversion/subversion/include/ |
| H A D | svn_wc.h | 1879 const char *merged_file; member in struct:svn_wc_conflict_description2_t
2006 const char *merged_file; member in struct:svn_wc_conflict_description_t
2215 const char *merged_file; member in struct:svn_wc_conflict_result_t
[all...] |
Completed in 224 milliseconds