Lines Matching refs:markers
356 svn_skel_t *markers;
368 markers = svn_skel__make_empty_list(result_pool);
377 svn_skel__prepend_str(their_relpath, markers, result_pool);
380 svn_skel__prepend(svn_skel__make_empty_list(result_pool), markers);
389 svn_skel__prepend_str(mine_relpath, markers, result_pool);
392 svn_skel__prepend(svn_skel__make_empty_list(result_pool), markers);
401 svn_skel__prepend_str(original_relpath, markers, result_pool);
404 svn_skel__prepend(svn_skel__make_empty_list(result_pool), markers);
406 svn_skel__prepend(markers, text_conflict);
431 svn_skel_t *markers;
488 markers = svn_skel__make_empty_list(result_pool);
497 svn_skel__prepend_str(marker_relpath, markers, result_pool);
500 svn_skel__prepend(svn_skel__make_empty_list(result_pool), markers);*/
502 svn_skel__prepend(markers, prop_conflict);
548 svn_skel_t *markers;
596 markers = svn_skel__make_empty_list(result_pool);
597 svn_skel__prepend(markers, tree_conflict);
973 c = c->next; /* Skip markers */
1040 svn_wc__conflict_read_markers(const apr_array_header_t **markers,
1059 /* Get the list of markers stored per conflict */
1079 *markers = list;
1494 NULL, NULL, NULL, NULL, /* markers */
1591 * Set *FOUND_ARTIFACT to true if conflict markers are removed; otherwise
2400 * Note: When there are no conflict markers on-disk to remove there is