Searched refs:isConflict (Results 1 – 3 of 3) sorted by relevance
| /web-bugs/src/Horde/Text/Diff/ThreeWay/Op/ | ||
| H A D | Copy.php | 25 public function isConflict() function in Horde_Text_Diff_ThreeWay_Op_Copy |
| H A D | Base.php | 37 public function isConflict() function in Horde_Text_Diff_ThreeWay_Op_Base |
| /web-bugs/src/Horde/Text/Diff/ | ||
| H A D | ThreeWay.php | 54 if ($edit->isConflict()) { |
Completed in 8 milliseconds
