Home
last modified time | relevance | path

Searched refs:merged (Results 1 – 2 of 2) sorted by path

/dokuwiki/inc/
H A DDifferenceEngine.php1351 $lines = array_merge($lines, $edit->merged());
1448 function merged() { function in _Diff3_Op
1465 return $this->merged() === false;
1483 function merged() { function in _Diff3_Op_copy
/dokuwiki/vendor/geshi/geshi/
H A DCHANGELOG893 - Bugfix: Styles incorrectly overriding default styles instead of being merged