Searched refs:merged (Results 1 – 2 of 2) sorted by relevance
501 * If possible, move the fully-merged run of changes1343 * Returns the merged lines1348 * @return array lines of the merged text1363 $lines = array_merge($lines, $edit->merged());1472 function merged() { function in _Diff3_Op 1489 return $this->merged() === false;1507 function merged() { function in _Diff3_Op_copy
893 - Bugfix: Styles incorrectly overriding default styles instead of being merged