Searched defs:conflict_func (Results 1 – 6 of 6) sorted by relevance
| /NextBSD/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 1154 svn_wc_conflict_resolver_func2_t conflict_func, in generate_propconflict()
2911 svn_wc_conflict_resolver_func2_t conflict_func; member
3109 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__resolve_conflicts()
|
| HD | update_editor.c | 243 svn_wc_conflict_resolver_func2_t conflict_func; member
4858 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor()
5144 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_update_editor()
5187 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_switch_editor()
|
| HD | deprecated.c | 2581 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge_props2()
3549 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_get_update_editor4()
3595 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_get_update_editor3()
3735 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_get_switch_editor4()
3780 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_get_switch_editor3()
4516 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge4()
4557 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge3()
|
| HD | merge.c | 1221 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge5()
|
| HD | props.c | 166 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge_props3()
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | svn_client.h | 1003 svn_wc_conflict_resolver_func_t conflict_func; member
|