Searched refs:isConflict (Results 1 – 1 of 1) sorted by last modified time
1353 if ($edit->isConflict()) {1488 function isConflict() { function in _Diff3_Op 1511 function isConflict() { function in _Diff3_Op_copy