Searched refs:merge_showing_conflicts (Results 1 – 1 of 1) sorted by relevance
1415 merge_showing_conflicts(const char **chosen_abspath, in merge_showing_conflicts() function1652 SVN_ERR(merge_showing_conflicts(&install_from_abspath, in build_text_conflict_resolve_items()