Searched refs:merged (Results 1 – 3 of 3) sorted by relevance
344 $merged = array_replace_recursive($old, $new); variable in dokuwiki\\Search\\Collection\\AbstractCollection346 $this->updateIndexes($merged, $entityId);347 $this->saveReverseAssignments($entity, $merged);
1363 $lines = array_merge($lines, $edit->merged());1472 function merged() { function in _Diff3_Op1489 return $this->merged() === false;1507 function merged() { function in _Diff3_Op_copy
895 - Bugfix: Styles incorrectly overriding default styles instead of being merged