Searched refs:abort_merge (Results 1 - 1 of 1) sorted by relevance
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| H A D | file-merge.c | 83 svn_boolean_t abort_merge; member in struct:file_merge_baton
163 if (b->abort_merge)
189 if (b->abort_merge)
216 if (b->abort_merge)
243 if (b->abort_merge)
579 svn_boolean_t *abort_merge,
596 *abort_merge = FALSE;
738 *abort_merge = TRUE;
754 svn_boolean_t *abort_merge,
779 SVN_ERR(merge_chunks(&merged_chunk, abort_merge, chunk
578 merge_chunks(apr_array_header_t **merged_chunk, svn_boolean_t *abort_merge, apr_array_header_t *chunk1, apr_array_header_t *chunk2, svn_linenum_t current_line1, svn_linenum_t current_line2, const char *editor_cmd, apr_hash_t *config, apr_pool_t *result_pool, 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
[all...] |
Completed in 429 milliseconds