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

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupdate_editor.c374 svn_skel_t *edit_conflict;
770 svn_skel_t *edit_conflict;
907 if (db->edit_conflict)
911 SVN_ERR(complete_conflict(db->edit_conflict, db->edit_baton,
920 db->edit_conflict, NULL,
943 if (fb->edit_conflict)
947 SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton,
956 fb->edit_conflict, NULL,
1284 db->edit_conflict = tree_conflict;
2043 db->edit_conflict
371 svn_skel_t *edit_conflict; member in struct:dir_baton
767 svn_skel_t *edit_conflict; member in struct:file_baton
[all...]

Completed in 110 milliseconds