Searched defs:conflict_baton (Results 1 – 6 of 6) sorted by relevance
| /NextBSD/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 1155 void *conflict_baton, in generate_propconflict() 2912 void *conflict_baton; member 3110 void *conflict_baton, in svn_wc__resolve_conflicts()
|
| HD | update_editor.c | 244 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()
|
| HD | deprecated.c | 2582 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()
|
| HD | merge.c | 1222 void *conflict_baton, in svn_wc_merge5()
|
| HD | props.c | 167 void *conflict_baton, in svn_wc_merge_props3()
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | svn_client.h | 1004 void *conflict_baton; member
|