Home
last modified time | relevance | path

Searched defs:conflict_baton (Results 1 – 6 of 6) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDconflicts.c1155 void *conflict_baton, in generate_propconflict()
2912 void *conflict_baton; member
3110 void *conflict_baton, in svn_wc__resolve_conflicts()
HDupdate_editor.c244 void *conflict_baton; member
4859 void *conflict_baton, in make_editor()
5145 void *conflict_baton, in svn_wc__get_update_editor()
5188 void *conflict_baton, in svn_wc__get_switch_editor()
HDdeprecated.c2582 void *conflict_baton, in svn_wc_merge_props2()
3550 void *conflict_baton, in svn_wc_get_update_editor4()
3596 void *conflict_baton, in svn_wc_get_update_editor3()
3736 void *conflict_baton, in svn_wc_get_switch_editor4()
3781 void *conflict_baton, in svn_wc_get_switch_editor3()
4517 void *conflict_baton, in svn_wc_merge4()
4558 void *conflict_baton, in svn_wc_merge3()
HDmerge.c1222 void *conflict_baton, in svn_wc_merge5()
HDprops.c167 void *conflict_baton, in svn_wc_merge_props3()
/NextBSD/contrib/subversion/subversion/include/
HDsvn_client.h1004 void *conflict_baton; member