Home
last modified time | relevance | path

Searched refs:isConflict (Results 1 – 3 of 3) sorted by relevance

/web-bugs/src/Horde/Text/Diff/ThreeWay/Op/
H A DCopy.php25 public function isConflict() function in Horde_Text_Diff_ThreeWay_Op_Copy
H A DBase.php37 public function isConflict() function in Horde_Text_Diff_ThreeWay_Op_Base
/web-bugs/src/Horde/Text/Diff/
H A DThreeWay.php54 if ($edit->isConflict()) {

Completed in 4 milliseconds