Searched refs:conflict_func_1to2_wrapper (Results 1 – 1 of 1) sorted by relevance
2559 conflict_func_1to2_wrapper(svn_wc_conflict_result_t **result, in conflict_func_1to2_wrapper() function2612 conflict_func ? conflict_func_1to2_wrapper in svn_wc_merge_props2()3646 conflict_func ? conflict_func_1to2_wrapper in svn_wc_get_update_editor3()3829 conflict_func ? conflict_func_1to2_wrapper in svn_wc_get_switch_editor3()4592 conflict_func ? conflict_func_1to2_wrapper : NULL, in svn_wc_merge3()