Searched refs:text_conflict (Results 1 - 1 of 1) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.c355 svn_skel_t *text_conflict;
358 SVN_ERR(conflict__get_conflict(&text_conflict, conflict_skel,
361 SVN_ERR_ASSERT(!text_conflict); /* ### Use proper error? */
367 text_conflict = svn_skel__make_empty_list(result_pool);
406 svn_skel__prepend(markers, text_conflict);
407 svn_skel__prepend_str(SVN_WC__CONFLICT_KIND_TEXT, text_conflict,
411 svn_skel__prepend(text_conflict, conflict_skel->children->next);
796 svn_skel_t *text_conflict;
799 SVN_ERR(conflict__get_conflict(&text_conflict, conflict_skel,
802 if (!text_conflict)
354 svn_skel_t *text_conflict; local
795 svn_skel_t *text_conflict; local
[all...]

Completed in 64 milliseconds