Searched refs:html_conflict_solving (Results 1 – 1 of 1) sorted by relevance
163 $this->html_conflict_solving(con($PRE,$TEXT,$SUF));231 function html_conflict_solving($text) { function in action_plugin_conflictmerger