[midPoint-git] [Evolveum/prism] de3d35: Fix ItemDeltaCollectionsUtil.merge method

[mederly]

  Branch: refs/heads/support-4.8
  Home:   https://github.com/Evolveum/prism
  Commit: de3d3545c3765c8a3fb03bec0b2c8c3c5b9b812d
      https://github.com/Evolveum/prism/commit/de3d3545c3765c8a3fb03bec0b2c8c3c5b9b812d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-12-10 (Tue, 10 Dec 2024)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/ItemDeltaCollectionsUtil.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java

  Log Message:
  -----------
  Fix ItemDeltaCollectionsUtil.merge method

This fixes failing TestResourceInMaintenance.test120.

Related to recent fix for MID-10195.

(cherry picked from commit 917a269f494bb87b96e96f3effbbfcf7fb013937)



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/prism/settings/notifications